:zap: 字典模块的dictKey修改为String后的代码优化

src/main/java/org/springblade/common/cache/DictBizCache.java

@@ -57,10 +57,21 @@ public class DictBizCache {
 	 * 获取字典值
 	 *
 	 * @param code    字典编号
-	 * @param dictKey 字典键
+	 * @param dictKey Integer型字典键
 	 * @return
 	 */
 	public static String getValue(String code, Integer dictKey) {
+		return CacheUtil.get(DICT_CACHE, DICT_VALUE + code + StringPool.COLON, String.valueOf(dictKey), () -> dictService.getValue(code, String.valueOf(dictKey)));
+	}
+
+	/**
+	 * 获取字典值
+	 *
+	 * @param code    字典编号
+	 * @param dictKey String型字典键
+	 * @return
+	 */
+	public static String getValue(String code, String dictKey) {
 		return CacheUtil.get(DICT_CACHE, DICT_VALUE + code + StringPool.COLON, dictKey, () -> dictService.getValue(code, dictKey));
 	}
 

src/main/java/org/springblade/common/cache/DictCache.java

@@ -57,10 +57,21 @@ public class DictCache {
 	 * 获取字典值
 	 *
 	 * @param code    字典编号
-	 * @param dictKey 字典键
+	 * @param dictKey Integer型字典键
 	 * @return
 	 */
 	public static String getValue(String code, Integer dictKey) {
+		return CacheUtil.get(DICT_CACHE, DICT_VALUE + code + StringPool.COLON, String.valueOf(dictKey), () -> dictService.getValue(code, String.valueOf(dictKey)));
+	}
+
+	/**
+	 * 获取字典值
+	 *
+	 * @param code    字典编号
+	 * @param dictKey String型字典键
+	 * @return
+	 */
+	public static String getValue(String code, String dictKey) {
 		return CacheUtil.get(DICT_CACHE, DICT_VALUE + code + StringPool.COLON, dictKey, () -> dictService.getValue(code, dictKey));
 	}
 

src/main/java/org/springblade/modules/system/mapper/DictBizMapper.java

@@ -36,7 +36,7 @@ public interface DictBizMapper extends BaseMapper<DictBiz> {
 	 * @param dictKey 字典序号
 	 * @return
 	 */
-	String getValue(String code, Integer dictKey);
+	String getValue(String code, String dictKey);
 
 	/**
 	 * 获取字典表

src/main/java/org/springblade/modules/system/mapper/DictMapper.java

@@ -46,7 +46,7 @@ public interface DictMapper extends BaseMapper<Dict> {
 	 * @param dictKey 字典序号
 	 * @return
 	 */
-	String getValue(String code, Integer dictKey);
+	String getValue(String code, String dictKey);
 
 	/**
 	 * 获取字典表

src/main/java/org/springblade/modules/system/service/IDictBizService.java

@@ -53,7 +53,7 @@ public interface IDictBizService extends IService<DictBiz> {
 	 * @param dictKey 字典序号
 	 * @return
 	 */
-	String getValue(String code, Integer dictKey);
+	String getValue(String code, String dictKey);
 
 	/**
 	 * 获取字典表

src/main/java/org/springblade/modules/system/service/IDictService.java

@@ -62,7 +62,7 @@ public interface IDictService extends IService<Dict> {
 	 * @param dictKey 字典序号
 	 * @return
 	 */
-	String getValue(String code, Integer dictKey);
+	String getValue(String code, String dictKey);
 
 	/**
 	 * 获取字典表

src/main/java/org/springblade/modules/system/service/impl/DictBizServiceImpl.java

@@ -60,7 +60,7 @@ public class DictBizServiceImpl extends ServiceImpl<DictBizMapper, DictBiz> impl
 	}
 
 	@Override
-	public String getValue(String code, Integer dictKey) {
+	public String getValue(String code, String dictKey) {
 		return Func.toStr(baseMapper.getValue(code, dictKey), StringPool.EMPTY);
 	}
 

src/main/java/org/springblade/modules/system/service/impl/DictServiceImpl.java

@@ -65,7 +65,7 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements ID
 	}
 
 	@Override
-	public String getValue(String code, Integer dictKey) {
+	public String getValue(String code, String dictKey) {
 		return Func.toStr(baseMapper.getValue(code, dictKey), StringPool.EMPTY);
 	}