From a4c35cecaab01c211e7ba077e63a0941ef4335b2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 10 四月 2023 17:51:40 +0800
Subject: [PATCH] 优化用户导入更新时需获取用户编号问题
---
src/main/java/com/ruoyi/common/utils/DictUtils.java | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/DictUtils.java b/src/main/java/com/ruoyi/common/utils/DictUtils.java
index e3d3612..aa7656d 100644
--- a/src/main/java/com/ruoyi/common/utils/DictUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/DictUtils.java
@@ -2,7 +2,8 @@
import java.util.Collection;
import java.util.List;
-import com.ruoyi.common.constant.Constants;
+import com.alibaba.fastjson2.JSONArray;
+import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.redis.RedisCache;
import com.ruoyi.project.system.domain.SysDictData;
@@ -38,11 +39,10 @@
*/
public static List<SysDictData> getDictCache(String key)
{
- Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
- if (StringUtils.isNotNull(cacheObj))
+ JSONArray arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
+ if (StringUtils.isNotNull(arrayCache))
{
- List<SysDictData> dictDatas = StringUtils.cast(cacheObj);
- return dictDatas;
+ return arrayCache.toList(SysDictData.class);
}
return null;
}
@@ -84,27 +84,30 @@
StringBuilder propertyString = new StringBuilder();
List<SysDictData> datas = getDictCache(dictType);
- if (StringUtils.containsAny(separator, dictValue) && StringUtils.isNotEmpty(datas))
+ if (StringUtils.isNotEmpty(datas))
{
- for (SysDictData dict : datas)
+ if (StringUtils.containsAny(separator, dictValue))
{
- for (String value : dictValue.split(separator))
+ for (SysDictData dict : datas)
{
- if (value.equals(dict.getDictValue()))
+ for (String value : dictValue.split(separator))
{
- propertyString.append(dict.getDictLabel() + separator);
- break;
+ if (value.equals(dict.getDictValue()))
+ {
+ propertyString.append(dict.getDictLabel()).append(separator);
+ break;
+ }
}
}
}
- }
- else
- {
- for (SysDictData dict : datas)
+ else
{
- if (dictValue.equals(dict.getDictValue()))
+ for (SysDictData dict : datas)
{
- return dict.getDictLabel();
+ if (dictValue.equals(dict.getDictValue()))
+ {
+ return dict.getDictLabel();
+ }
}
}
}
@@ -132,7 +135,7 @@
{
if (label.equals(dict.getDictLabel()))
{
- propertyString.append(dict.getDictValue() + separator);
+ propertyString.append(dict.getDictValue()).append(separator);
break;
}
}
@@ -152,11 +155,21 @@
}
/**
+ * 鍒犻櫎鎸囧畾瀛楀吀缂撳瓨
+ *
+ * @param key 瀛楀吀閿�
+ */
+ public static void removeDictCache(String key)
+ {
+ SpringUtils.getBean(RedisCache.class).deleteObject(getCacheKey(key));
+ }
+
+ /**
* 娓呯┖瀛楀吀缂撳瓨
*/
public static void clearDictCache()
{
- Collection<String> keys = SpringUtils.getBean(RedisCache.class).keys(Constants.SYS_DICT_KEY + "*");
+ Collection<String> keys = SpringUtils.getBean(RedisCache.class).keys(CacheConstants.SYS_DICT_KEY + "*");
SpringUtils.getBean(RedisCache.class).deleteObject(keys);
}
@@ -168,6 +181,6 @@
*/
public static String getCacheKey(String configKey)
{
- return Constants.SYS_DICT_KEY + configKey;
+ return CacheConstants.SYS_DICT_KEY + configKey;
}
}
--
Gitblit v1.9.3