【7.6.0】【dict】更新字典类型实体，更新删除字典类型接口

kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDictType.java

@@ -24,9 +24,12 @@
  */
 package cn.stylefeng.roses.kernel.dict.modular.entity;
 
-import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
+import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseBusinessEntity;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -41,7 +44,7 @@ import java.math.BigDecimal;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("sys_dict_type")
-public class SysDictType extends BaseEntity {
+public class SysDictType extends BaseBusinessEntity {
 
     /**
      * 字典类型id
@@ -106,11 +109,4 @@ public class SysDictType extends BaseEntity {
     @ChineseDescription("排序")
     private BigDecimal dictTypeSort;
 
-    /**
-     * 删除标记 Y-已删除，N-未删除，参考 YesOrNotEnum
-     */
-    @TableField(value = "del_flag", fill = FieldFill.INSERT)
-    @ChineseDescription("删除标记")
-    private String delFlag;
-
 }

kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/request/DictTypeRequest.java

@@ -48,7 +48,7 @@ public class DictTypeRequest extends BaseRequest {
     /**
      * 字典类型id
      */
-    @NotNull(message = "id不能为空", groups = {edit.class, delete.class, detail.class, updateStatus.class})
+    @NotNull(message = "id不能为空", groups = {edit.class, delete.class, detail.class})
     @ChineseDescription("字典类型id")
     private Long dictTypeId;
 
@@ -56,7 +56,7 @@ public class DictTypeRequest extends BaseRequest {
      * 字典类型： 1-业务类型，2-系统类型，参考 DictTypeClassEnum
      */
     @NotNull(message = "字典类型不能为空", groups = {add.class, edit.class})
-    @ChineseDescription("字典类型")
+    @ChineseDescription("字典类型： 1-业务类型，2-系统类型")
     private Integer dictTypeClass;
 
     /**
@@ -101,8 +101,8 @@ public class DictTypeRequest extends BaseRequest {
     /**
      * 字典类型的状态：1-启用，2-禁用，参考 StatusEnum
      */
-    @NotNull(message = "状态不能为空", groups = {updateStatus.class})
+    @StatusValue(groups = {add.class, edit.class})
-    @StatusValue(groups = updateStatus.class)
+    @NotNull(message = "状态不能为空", groups = {add.class, edit.class})
     @ChineseDescription("字典类型的状态：1-启用，2-禁用")
     private Integer statusFlag;
 

kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java

@@ -108,5 +108,12 @@ public interface DictService extends IService<SysDict>, DictApi {
      */
     List<TreeDictInfo> getTreeDictList(DictRequest dictRequest);
 
+    /**
+     * 删除字典类型下的所有字典
+     *
+     * @author fengshuonan
+     * @since 2023/6/27 16:24
+     */
+    void removeByDictTypeId(Long dictTypeId);
 
 }

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

@@ -167,6 +167,13 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, SysDict> implements
         return new DefaultTreeBuildFactory<TreeDictInfo>().doTreeBuild(treeDictInfos);
     }
 
+    @Override
+    public void removeByDictTypeId(Long dictTypeId) {
+        LambdaQueryWrapper<SysDict> sysDictLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        sysDictLambdaQueryWrapper.eq(SysDict::getDictTypeId, dictTypeId);
+        this.remove(sysDictLambdaQueryWrapper);
+    }
+
     @Override
     public String getDictName(String dictTypeCode, String dictCode) {
         String dictName = defaultStringCacheOperator.get(CACHE_PREFIX + dictTypeCode + "|" + dictCode);

kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictTypeServiceImpl.java

@@ -36,6 +36,7 @@ import cn.stylefeng.roses.kernel.dict.api.exception.enums.DictExceptionEnum;
 import cn.stylefeng.roses.kernel.dict.modular.entity.SysDictType;
 import cn.stylefeng.roses.kernel.dict.modular.mapper.DictTypeMapper;
 import cn.stylefeng.roses.kernel.dict.modular.pojo.request.DictTypeRequest;
+import cn.stylefeng.roses.kernel.dict.modular.service.DictService;
 import cn.stylefeng.roses.kernel.dict.modular.service.DictTypeService;
 import cn.stylefeng.roses.kernel.pinyin.api.PinYinApi;
 import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
@@ -61,6 +62,9 @@ public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, SysDictType
     @Resource
     private PinYinApi pinYinApi;
 
+    @Resource
+    private DictService dictService;
+
     @Override
     public void add(DictTypeRequest dictTypeRequest) {
 
@@ -81,10 +85,11 @@ public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, SysDictType
         // 如果是系统级字典，只允许管理员操作
         validateSystemTypeClassOperate(dictTypeRequest);
 
-        SysDictType sysDictType = this.querySysDictType(dictTypeRequest);
+        // 删除字典类型
-        sysDictType.setDelFlag(YesOrNotEnum.Y.getCode());
+        this.removeById(dictTypeRequest.getDictTypeId());
-        this.updateById(sysDictType);
 
+        // 删除字典类型下的所有字典
+        dictService.removeByDictTypeId(dictTypeRequest.getDictTypeId());
     }
 
     @Override