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

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictBizCache.java

@@ -64,10 +64,24 @@ 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), () -> {
+			R<String> result = getDictClient().getValue(code, String.valueOf(dictKey));
+			return result.getData();
+		});
+	}
+
+	/**
+	 * 获取字典值
+	 *
+	 * @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, () -> {
 			R<String> result = getDictClient().getValue(code, dictKey);
 			return result.getData();

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictCache.java

@@ -64,10 +64,24 @@ 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), () -> {
+			R<String> result = getDictClient().getValue(code, String.valueOf(dictKey));
+			return result.getData();
+		});
+	}
+
+	/**
+	 * 获取字典值
+	 *
+	 * @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, () -> {
 			R<String> result = getDictClient().getValue(code, dictKey);
 			return result.getData();

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictBizClient.java

@@ -59,7 +59,7 @@ public interface IDictBizClient {
 	 * @return
 	 */
 	@GetMapping(GET_VALUE)
-	R<String> getValue(@RequestParam("code") String code, @RequestParam("dictKey") Integer dictKey);
+	R<String> getValue(@RequestParam("code") String code, @RequestParam("dictKey") String dictKey);
 
 	/**
 	 * 获取字典表

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictBizClientFallback.java

@@ -35,7 +35,7 @@ public class IDictBizClientFallback implements IDictBizClient {
 	}
 
 	@Override
-	public R<String> getValue(String code, Integer dictKey) {
+	public R<String> getValue(String code, String dictKey) {
 		return R.fail("获取数据失败");
 	}
 

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictClient.java

@@ -59,7 +59,7 @@ public interface IDictClient {
 	 * @return
 	 */
 	@GetMapping(GET_VALUE)
-	R<String> getValue(@RequestParam("code") String code, @RequestParam("dictKey") Integer dictKey);
+	R<String> getValue(@RequestParam("code") String code, @RequestParam("dictKey") String dictKey);
 
 	/**
 	 * 获取字典表

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictClientFallback.java

@@ -35,7 +35,7 @@ public class IDictClientFallback implements IDictClient {
 	}
 
 	@Override
-	public R<String> getValue(String code, Integer dictKey) {
+	public R<String> getValue(String code, String dictKey) {
 		return R.fail("获取数据失败");
 	}
 

blade-service/blade-system/src/main/java/org/springblade/system/feign/DictBizClient.java

@@ -48,7 +48,7 @@ public class DictBizClient implements IDictBizClient {
 
 	@Override
 	@GetMapping(GET_VALUE)
-	public R<String> getValue(String code, Integer dictKey) {
+	public R<String> getValue(String code, String dictKey) {
 		return R.data(service.getValue(code, dictKey));
 	}
 

blade-service/blade-system/src/main/java/org/springblade/system/feign/DictClient.java

@@ -48,7 +48,7 @@ public class DictClient implements IDictClient {
 
 	@Override
 	@GetMapping(GET_VALUE)
-	public R<String> getValue(String code, Integer dictKey) {
+	public R<String> getValue(String code, String dictKey) {
 		return R.data(service.getValue(code, dictKey));
 	}
 

blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.java

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

blade-service/blade-system/src/main/java/org/springblade/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);
 
 	/**
 	 * 获取字典表

blade-service/blade-system/src/main/java/org/springblade/system/service/IDictBizService.java

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

blade-service/blade-system/src/main/java/org/springblade/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);
 
 	/**
 	 * 获取字典表

blade-service/blade-system/src/main/java/org/springblade/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);
 	}
 

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java

@@ -66,7 +66,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);
 	}