jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 删除通用工具 改为使用hutool

Browse Source
This commit is contained in:
疯狂的狮子li
2021-03-15 16:38:43 +08:00
parent 46aa17db9c
commit 9b4b9e0c74
73 changed files with 720 additions and 3681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
View File

@ -2,6 +2,9 @@ package com.ruoyi.common.utils;
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 class DictUtils
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 @@ public class DictUtils
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 @@ public class DictUtils
}
}
}
return StringUtils.stripEnd(propertyString.toString(), separator);
return StrUtil.strip(propertyString.toString(), null, separator);
}
/**
@ -124,7 +127,7 @@ public class DictUtils
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 @@ public class DictUtils
}
}
}
return StringUtils.stripEnd(propertyString.toString(), separator);
return StrUtil.strip(propertyString.toString(), null, separator);
}
/**