From d3735b1f1758079dc6c56d814c03b1e29a2d6263 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 20 七月 2020 15:10:19 +0800
Subject: [PATCH] Excel导出导入支持dictType字典类型
---
src/main/java/com/ruoyi/common/utils/DictUtils.java | 52 ++++++++++++++++++++++++++
src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java | 5 ++
src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 38 ++++++++++++++++++-
3 files changed, 93 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/DictUtils.java b/src/main/java/com/ruoyi/common/utils/DictUtils.java
index 0c1ee5d..5e97f53 100644
--- a/src/main/java/com/ruoyi/common/utils/DictUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/DictUtils.java
@@ -43,6 +43,58 @@
}
/**
+ * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏稿�艰幏鍙栧瓧鍏告爣绛�
+ *
+ * @param dictType 瀛楀吀绫诲瀷
+ * @param dictValue 瀛楀吀鍊�
+ * @return 瀛楀吀鏍囩
+ */
+ public static String getDictLabel(String dictType, String dictValue)
+ {
+ if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotEmpty(dictValue))
+ {
+ List<SysDictData> datas = getDictCache(dictType);
+ if (StringUtils.isNotEmpty(datas))
+ {
+ for (SysDictData dict : datas)
+ {
+ if (dictValue.equals(dict.getDictValue()))
+ {
+ return dict.getDictLabel();
+ }
+ }
+ }
+ }
+ return dictValue;
+ }
+
+ /**
+ * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏告爣绛捐幏鍙栧瓧鍏稿��
+ *
+ * @param dictType 瀛楀吀绫诲瀷
+ * @param dictLabel 瀛楀吀鏍囩
+ * @return 瀛楀吀鍊�
+ */
+ public static String getDictValue(String dictType, String dictLabel)
+ {
+ if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotEmpty(dictLabel))
+ {
+ List<SysDictData> datas = getDictCache(dictType);
+ if (StringUtils.isNotEmpty(datas))
+ {
+ for (SysDictData dict : datas)
+ {
+ if (dictLabel.equals(dict.getDictLabel()))
+ {
+ return dict.getDictValue();
+ }
+ }
+ }
+ }
+ return dictLabel;
+ }
+
+ /**
* 娓呯┖瀛楀吀缂撳瓨
*/
public static void clearDictCache()
diff --git a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 623c886..b64e93e 100644
--- a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -44,6 +44,7 @@
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.reflect.ReflectUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -270,7 +271,11 @@
}
else if (StringUtils.isNotEmpty(attr.readConverterExp()))
{
- val = reverseByExp(String.valueOf(val), attr.readConverterExp());
+ val = reverseByExp(Convert.toStr(val), attr.readConverterExp());
+ }
+ else if (StringUtils.isNotEmpty(attr.dictType()))
+ {
+ val = reverseDictByExp(attr.dictType(), Convert.toStr(val));
}
ReflectUtils.invokeSetter(entity, propertyName, val);
}
@@ -529,13 +534,18 @@
Object value = getTargetValue(vo, field, attr);
String dateFormat = attr.dateFormat();
String readConverterExp = attr.readConverterExp();
+ String dictType = attr.dictType();
if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
{
cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value));
}
else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
{
- cell.setCellValue(convertByExp(String.valueOf(value), readConverterExp));
+ cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp));
+ }
+ else if (StringUtils.isNotEmpty(dictType))
+ {
+ cell.setCellValue(convertDictByExp(dictType, Convert.toStr(value)));
}
else
{
@@ -667,6 +677,30 @@
}
/**
+ * 瑙ｆ瀽瀛楀吀鍊�
+ *
+ * @param dictType 瀛楀吀绫诲瀷
+ * @param dictValue 瀛楀吀鍊�
+ * @return 瀛楀吀鏍囩
+ */
+ public static String convertDictByExp(String dictType, String dictValue) throws Exception
+ {
+ return DictUtils.getDictLabel(dictType, dictValue);
+ }
+
+ /**
+ * 鍙嶅悜瑙ｆ瀽鍊煎瓧鍏稿��
+ *
+ * @param dictType 瀛楀吀绫诲瀷
+ * @param dictValue 瀛楀吀鏍囩
+ * @return 瀛楀吀鍊�
+ */
+ public static String reverseDictByExp(String dictType, String dictLabel) throws Exception
+ {
+ return DictUtils.getDictValue(dictType, dictLabel);
+ }
+
+ /**
* 缂栫爜鏂囦欢鍚�
*/
public String encodingFilename(String filename)
diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
index 9e6e701..39c92a6 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
@@ -30,6 +30,11 @@
public String dateFormat() default "";
/**
+ * 濡傛灉鏄瓧鍏哥被鍨嬶紝璇疯缃瓧鍏哥殑type鍊�
+ */
+ public String dictType() default "";
+
+ /**
* 璇诲彇鍐呭杞〃杈惧紡 (濡�: 0=鐢�,1=濂�,2=鏈煡)
*/
public String readConverterExp() default "";
--
Gitblit v1.9.3