From 8a076e175f6ae1815c66b00dbc9f8b0090683e1a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 20 七月 2020 15:25:05 +0800
Subject: [PATCH] Excel导出导入支持dictType字典类型

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 52 insertions(+), 1 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
index 6fb6289..cdc6f6f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
@@ -2,7 +2,6 @@
 
 import java.util.Collection;
 import java.util.List;
-
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.redis.RedisCache;
@@ -44,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()

--
Gitblit v1.9.2