From d07ac48f4717c74c8b8d592de5d73749b6cc5485 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Mon, 26 Jun 2023 23:59:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90dict=E3=80=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E5=85=B8=E5=AE=9E=E4=BD=93=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=92=8Ctype=E5=85=B3=E8=81=94?= =?UTF-8?q?=E6=94=B9=E4=B8=BAid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/dict/modular/entity/SysDict.java | 28 +++++++++---------- .../modular/service/impl/DictServiceImpl.java | 14 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDict.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDict.java index 155c8a8b5..7ad6e5770 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDict.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDict.java @@ -52,6 +52,13 @@ public class SysDict extends BaseEntity { @ChineseDescription("字典id") private Long dictId; + /** + * 字典类型的id + */ + @TableField("dict_type_id") + @ChineseDescription("字典类型的id") + private String dictTypeId; + /** * 字典编码 */ @@ -80,13 +87,6 @@ public class SysDict extends BaseEntity { @ChineseDescription("字典编码") private String dictEncode; - /** - * 字典类型的编码 - */ - @TableField("dict_type_code") - @ChineseDescription("字典类型的编码") - private String dictTypeCode; - /** * 字典简称 */ @@ -108,6 +108,13 @@ public class SysDict extends BaseEntity { @ChineseDescription("上级字典的id(如果没有上级字典id，则为-1)") private Long dictParentId; + /** + * 父id集合 + */ + @TableField("dict_pids") + @ChineseDescription("父id集合") + private String dictPids; + /** * 状态：(1-启用,2-禁用),参考 StatusEnum */ @@ -122,13 +129,6 @@ public class SysDict extends BaseEntity { @ChineseDescription("排序") private BigDecimal dictSort; - /** - * 父id集合 - */ - @TableField("dict_pids") - @ChineseDescription("父id集合") - private String dictPids; - /** * 是否删除，Y-被删除，N-未删除 */ diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java index d9f3b54de..b9e895eef 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java @@ -102,7 +102,7 @@ public class DictServiceImpl extends ServiceImpl implements this.updateById(sysDict); // 清除缓存中的字典值 - defaultStringCacheOperator.remove(CACHE_PREFIX + sysDict.getDictTypeCode() + "|" + sysDict.getDictCode()); + defaultStringCacheOperator.remove(CACHE_PREFIX + sysDict.getDictTypeId() + "|" + sysDict.getDictCode()); } @Override @@ -116,14 +116,14 @@ public class DictServiceImpl extends ServiceImpl implements BeanUtil.copyProperties(dictRequest, sysDict); // 不能修改字典类型和编码 - sysDict.setDictTypeCode(null); + sysDict.setDictTypeId(null); sysDict.setDictCode(null); sysDict.setDictNamePinyin(pinYinApi.parseEveryPinyinFirstLetter(sysDict.getDictName())); this.updateById(sysDict); // 清除缓存中的字典值 - defaultStringCacheOperator.remove(CACHE_PREFIX + sysDict.getDictTypeCode() + "|" + sysDict.getDictCode()); + defaultStringCacheOperator.remove(CACHE_PREFIX + sysDict.getDictTypeId() + "|" + sysDict.getDictCode()); } @Override @@ -174,7 +174,7 @@ public class DictServiceImpl extends ServiceImpl implements return dictName; } LambdaQueryWrapper sysDictLambdaQueryWrapper = new LambdaQueryWrapper<>(); - sysDictLambdaQueryWrapper.eq(SysDict::getDictTypeCode, dictTypeCode); + sysDictLambdaQueryWrapper.eq(SysDict::getDictTypeId, dictTypeCode); sysDictLambdaQueryWrapper.eq(SysDict::getDictCode, dictCode); sysDictLambdaQueryWrapper.ne(SysDict::getDelFlag, YesOrNotEnum.Y.getCode()); @@ -267,7 +267,7 @@ public class DictServiceImpl extends ServiceImpl implements // SQL拼接 queryWrapper.eq(ObjectUtil.isNotNull(dictRequest.getDictId()), SysDict::getDictId, dictRequest.getDictId()); - queryWrapper.eq(StrUtil.isNotBlank(dictRequest.getDictTypeCode()), SysDict::getDictTypeCode, dictRequest.getDictTypeCode()); + queryWrapper.eq(StrUtil.isNotBlank(dictRequest.getDictTypeCode()), SysDict::getDictTypeId, dictRequest.getDictTypeCode()); queryWrapper.eq(StrUtil.isNotBlank(dictRequest.getDictCode()), SysDict::getDictCode, dictRequest.getDictCode()); queryWrapper.like(StrUtil.isNotBlank(dictRequest.getDictName()), SysDict::getDictName, dictRequest.getDictName()); @@ -285,7 +285,7 @@ public class DictServiceImpl extends ServiceImpl implements // 检验同字典类型下是否有一样的编码 LambdaQueryWrapper sysDictLambdaQueryWrapper = new LambdaQueryWrapper<>(); - sysDictLambdaQueryWrapper.eq(SysDict::getDictTypeCode, dictRequest.getDictTypeCode()); + sysDictLambdaQueryWrapper.eq(SysDict::getDictTypeId, dictRequest.getDictTypeCode()); sysDictLambdaQueryWrapper.eq(SysDict::getDictCode, dictRequest.getDictCode()); if (editFlag) { sysDictLambdaQueryWrapper.ne(SysDict::getDictId, dictRequest.getDictId()); @@ -298,7 +298,7 @@ public class DictServiceImpl extends ServiceImpl implements // 检验同字典类型下是否有一样的名称 LambdaQueryWrapper dictNameWrapper = new LambdaQueryWrapper<>(); - dictNameWrapper.eq(SysDict::getDictTypeCode, dictRequest.getDictTypeCode()); + dictNameWrapper.eq(SysDict::getDictTypeId, dictRequest.getDictTypeCode()); dictNameWrapper.eq(SysDict::getDictName, dictRequest.getDictName()); if (editFlag) { dictNameWrapper.ne(SysDict::getDictId, dictRequest.getDictId());