From 9b4b9e0c744f43417a3c8b741f35090ab4e3c68f Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 15 三月 2021 16:38:43 +0800 Subject: [PATCH] update 删除通用工具 改为使用hutool --- ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 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 0d3a23d..34b89b3 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,6 +2,9 @@ import java.util.Collection; import java.util.List; + +import cn.hutool.core.lang.Validator; +import cn.hutool.core.util.StrUtil; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.redis.RedisCache; @@ -39,9 +42,9 @@ public static List<SysDictData> getDictCache(String key) { Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key)); - if (StringUtils.isNotNull(cacheObj)) + if (Validator.isNotNull(cacheObj)) { - List<SysDictData> dictDatas = StringUtils.cast(cacheObj); + List<SysDictData> dictDatas = (List<SysDictData>)cacheObj; return dictDatas; } return null; @@ -84,7 +87,7 @@ StringBuilder propertyString = new StringBuilder(); List<SysDictData> datas = getDictCache(dictType); - if (StringUtils.containsAny(separator, dictValue) && StringUtils.isNotEmpty(datas)) + if (StrUtil.containsAny(separator, dictValue) && Validator.isNotEmpty(datas)) { for (SysDictData dict : datas) { @@ -108,7 +111,7 @@ } } } - return StringUtils.stripEnd(propertyString.toString(), separator); + return StrUtil.strip(propertyString.toString(), null, separator); } /** @@ -124,7 +127,7 @@ StringBuilder propertyString = new StringBuilder(); List<SysDictData> datas = getDictCache(dictType); - if (StringUtils.containsAny(separator, dictLabel) && StringUtils.isNotEmpty(datas)) + if (StrUtil.containsAny(separator, dictLabel) && Validator.isNotEmpty(datas)) { for (SysDictData dict : datas) { @@ -148,7 +151,7 @@ } } } - return StringUtils.stripEnd(propertyString.toString(), separator); + return StrUtil.strip(propertyString.toString(), null, separator); } /** -- Gitblit v1.9.3