优化代码

pull/460/head
RuoYi 2 weeks ago
parent 31935f29e7
commit 2bf47dc87c

@ -120,7 +120,7 @@ public @interface Excel
public boolean isStatistics() default false; public boolean isStatistics() default false;
/** /**
* 导出类型(0数字 1字符串) * 导出类型(0数字 1字符串 2图片)
*/ */
public ColumnType cellType() default ColumnType.STRING; public ColumnType cellType() default ColumnType.STRING;

@ -5,7 +5,7 @@ package com.ruoyi.common.core.utils.poi;
* *
* @author ruoyi * @author ruoyi
*/ */
public interface ExcelDictDataConverter​ public interface ExcelDictDataConverter
{ {
/** /**
* 根据字典类型和字典键值获取字典标签 * 根据字典类型和字典键值获取字典标签

@ -207,7 +207,7 @@ public class ExcelUtil<T>
/** /**
* 字典数据转换器 * 字典数据转换器
*/ */
private ExcelDictDataConverter​ dictDataConverter; private ExcelDictDataConverter dictDataConverter;
public ExcelUtil(Class<T> clazz) public ExcelUtil(Class<T> clazz)
{ {
@ -239,13 +239,13 @@ public class ExcelUtil<T>
* *
* @return 字典数据转换器 * @return 字典数据转换器
*/ */
private ExcelDictDataConverter​ getDictDataConverter() private ExcelDictDataConverter getDictDataConverter()
{ {
if (dictDataConverter == null) if (dictDataConverter == null)
{ {
try try
{ {
dictDataConverter = SpringUtils.getBean(ExcelDictDataConverter​.class); dictDataConverter = SpringUtils.getBean(ExcelDictDataConverter.class);
} }
catch (Exception e) catch (Exception e)
{ {

@ -3,7 +3,7 @@ package com.ruoyi.common.security.utils.poi;
import java.util.List; import java.util.List;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.poi.ExcelDictDataConverter​; import com.ruoyi.common.core.utils.poi.ExcelDictDataConverter;
import com.ruoyi.common.security.utils.DictUtils; import com.ruoyi.common.security.utils.DictUtils;
import com.ruoyi.system.api.domain.SysDictData; import com.ruoyi.system.api.domain.SysDictData;
@ -13,7 +13,7 @@ import com.ruoyi.system.api.domain.SysDictData;
* @author ruoyi * @author ruoyi
*/ */
@Component @Component
public class DictDataConverter implements ExcelDictDataConverter​ public class DictDataConverter implements ExcelDictDataConverter
{ {
/** /**
* 分隔符 * 分隔符

Loading…
Cancel
Save