From ace261ec0f1cdab60457457826c4b6b9e86caf4e Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 27 五月 2022 16:56:38 +0800
Subject: [PATCH] 升级spring-boot到最新版本2.5.14
---
src/main/java/com/ruoyi/common/utils/DictUtils.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/DictUtils.java b/src/main/java/com/ruoyi/common/utils/DictUtils.java
index be6a73c..7432c16 100644
--- a/src/main/java/com/ruoyi/common/utils/DictUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/DictUtils.java
@@ -2,6 +2,7 @@
import java.util.Collection;
import java.util.List;
+import com.alibaba.fastjson2.JSONArray;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.redis.RedisCache;
@@ -38,10 +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))
{
- return StringUtils.cast(cacheObj);
+ return arrayCache.toList(SysDictData.class);
}
return null;
}
@@ -83,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()).append(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();
+ }
}
}
}
--
Gitblit v1.9.3