From eb78b4decb5f76dcc893809c56034230a3fcbd63 Mon Sep 17 00:00:00 2001 From: smallchill Date: Thu, 12 Dec 2019 20:43:22 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=AD=97=E5=85=B8=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84dictKey=E4=BF=AE=E6=94=B9=E4=B8=BAString=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/system/cache/DictBizCache.java | 16 +++++++++++++++- .../org/springblade/system/cache/DictCache.java | 16 +++++++++++++++- .../springblade/system/feign/IDictBizClient.java | 2 +- .../system/feign/IDictBizClientFallback.java | 2 +- .../springblade/system/feign/IDictClient.java | 2 +- .../system/feign/IDictClientFallback.java | 2 +- .../springblade/system/feign/DictBizClient.java | 2 +- .../org/springblade/system/feign/DictClient.java | 2 +- .../springblade/system/mapper/DictBizMapper.java | 2 +- .../springblade/system/mapper/DictMapper.java | 2 +- .../system/service/IDictBizService.java | 2 +- .../springblade/system/service/IDictService.java | 2 +- .../system/service/impl/DictBizServiceImpl.java | 2 +- .../system/service/impl/DictServiceImpl.java | 2 +- 14 files changed, 42 insertions(+), 14 deletions(-) diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictBizCache.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictBizCache.java index ae5c6b3e..759d2577 100644 --- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictBizCache.java +++ b/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 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 result = getDictClient().getValue(code, dictKey); return result.getData(); diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictCache.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictCache.java index 336b6047..33cd0895 100644 --- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictCache.java +++ b/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 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 result = getDictClient().getValue(code, dictKey); return result.getData(); diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictBizClient.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictBizClient.java index 6be99b63..0944f398 100644 --- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictBizClient.java +++ b/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 getValue(@RequestParam("code") String code, @RequestParam("dictKey") Integer dictKey); + R getValue(@RequestParam("code") String code, @RequestParam("dictKey") String dictKey); /** * 获取字典表 diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictBizClientFallback.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictBizClientFallback.java index eb879a7b..cde9af7c 100644 --- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictBizClientFallback.java +++ b/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 getValue(String code, Integer dictKey) { + public R getValue(String code, String dictKey) { return R.fail("获取数据失败"); } diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictClient.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictClient.java index d98ec0ab..52c3c43e 100644 --- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictClient.java +++ b/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 getValue(@RequestParam("code") String code, @RequestParam("dictKey") Integer dictKey); + R getValue(@RequestParam("code") String code, @RequestParam("dictKey") String dictKey); /** * 获取字典表 diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictClientFallback.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictClientFallback.java index d19a0fa6..d1b0c99f 100644 --- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictClientFallback.java +++ b/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 getValue(String code, Integer dictKey) { + public R getValue(String code, String dictKey) { return R.fail("获取数据失败"); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/DictBizClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/DictBizClient.java index 0b7fcd77..7f83916e 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/DictBizClient.java +++ b/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 getValue(String code, Integer dictKey) { + public R getValue(String code, String dictKey) { return R.data(service.getValue(code, dictKey)); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/DictClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/DictClient.java index 67854cb8..4ca9f736 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/DictClient.java +++ b/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 getValue(String code, Integer dictKey) { + public R getValue(String code, String dictKey) { return R.data(service.getValue(code, dictKey)); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.java index 8138362e..4e56d9d7 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.java @@ -37,7 +37,7 @@ public interface DictBizMapper extends BaseMapper { * @param dictKey 字典序号 * @return */ - String getValue(String code, Integer dictKey); + String getValue(String code, String dictKey); /** * 获取字典表 diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictMapper.java index e04b4ca4..b2374765 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictMapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictMapper.java @@ -46,7 +46,7 @@ public interface DictMapper extends BaseMapper { * @param dictKey 字典序号 * @return */ - String getValue(String code, Integer dictKey); + String getValue(String code, String dictKey); /** * 获取字典表 diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IDictBizService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IDictBizService.java index 90413afc..6788910f 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IDictBizService.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/IDictBizService.java @@ -54,7 +54,7 @@ public interface IDictBizService extends IService { * @param dictKey 字典序号 * @return */ - String getValue(String code, Integer dictKey); + String getValue(String code, String dictKey); /** * 获取字典表 diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IDictService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IDictService.java index 2772ada7..5de99109 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IDictService.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/IDictService.java @@ -62,7 +62,7 @@ public interface IDictService extends IService { * @param dictKey 字典序号 * @return */ - String getValue(String code, Integer dictKey); + String getValue(String code, String dictKey); /** * 获取字典表 diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictBizServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictBizServiceImpl.java index 15e56388..2c348aaa 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictBizServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictBizServiceImpl.java @@ -60,7 +60,7 @@ public class DictBizServiceImpl extends ServiceImpl 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); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java index 1b9a6ac3..8c079384 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java @@ -66,7 +66,7 @@ public class DictServiceImpl extends ServiceImpl 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); }