gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.6.0】【dict】调整字典实体的字段，和type关联改为id

pull/57/head
fengshuonan 2023-06-26 23:59:42 +08:00
parent 269e9e5ffd
commit d07ac48f47
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDict.java
View File

@ -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-未删除
*/

14
kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java
View File

@ -102,7 +102,7 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, SysDict> 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<DictMapper, SysDict> 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<DictMapper, SysDict> implements
return dictName;
}
LambdaQueryWrapper<SysDict> 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<DictMapper, SysDict> 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<DictMapper, SysDict> implements
// 检验同字典类型下是否有一样的编码
LambdaQueryWrapper<SysDict> 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<DictMapper, SysDict> implements
// 检验同字典类型下是否有一样的名称
LambdaQueryWrapper<SysDict> 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());