添加删除字典接口

src/main/java/org/rcisoft/sys/sysuser/controller/SysUserController.java

@@ -18,8 +18,10 @@ import org.rcisoft.core.service.CyRedisService;
 import org.rcisoft.core.util.*;
 import org.rcisoft.integration.jieLink.service.IJieLinkService;
 import org.rcisoft.sys.sysuser.dto.ExportUserDTO;
+import org.rcisoft.sys.sysuser.entity.SysDictData;
 import org.rcisoft.sys.sysuser.entity.SysUser;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.FastByteArrayOutputStream;
 import org.springframework.validation.BindingResult;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -336,4 +338,15 @@ public class SysUserController extends CyPaginationController<SysUser> {
         return cyResult;
     }
 
+    @PreAuthorize("@cyPerm.hasPerm('sys:dict:delete')")
+    @CyOpeLogAnno(title = "system-字典类型管理-删除字典类型", businessType = CyLogTypeEnum.DELETE)
+    @ApiOperation(value = "逻辑删除字典类型", notes = "逻辑删除字典类型")
+    @DeleteMapping("/deleteLogical")
+    public CyResult dictionaryDel(SysDictData data) {
+        return CyResultGenUtil.builder(sysUserServiceImpl.removeDictLogical(data),
+                CyMessCons.MESSAGE_ALERT_SUCCESS,
+                CyMessCons.MESSAGE_ALERT_ERROR,
+                data);
+    }
+
 }

src/main/java/org/rcisoft/sys/sysuser/entity/SysDictData.java

@@ -18,13 +18,10 @@ import java.util.List;
 @TableName("sys_dict_data")
 public class SysDictData  extends CyIdIncreEntity<SysDictData> {
 
-     //三级地址
-     private String diZhi;
-
      /**
      * @desc 字典排序
      * @column dict_sort
-     * @default 
+     * @default
      */
      @Excel(name = "字典排序", orderNum = "0", width = 20)
      private Integer dictSort;
@@ -32,7 +29,7 @@ public class SysDictData  extends CyIdIncreEntity<SysDictData> {
      /**
      * @desc 字典标签
      * @column dict_label
-     * @default 
+     * @default
      */
      @Excel(name = "字典标签", orderNum = "1", width = 20)
      private String dictLabel;
@@ -40,7 +37,7 @@ public class SysDictData  extends CyIdIncreEntity<SysDictData> {
      /**
      * @desc 字典键值
      * @column dict_value
-     * @default 
+     * @default
      */
      @Excel(name = "字典键值", orderNum = "2", width = 20)
      private String dictValue;
@@ -48,7 +45,7 @@ public class SysDictData  extends CyIdIncreEntity<SysDictData> {
      /**
      * @desc 字典类型
      * @column dict_type
-     * @default 
+     * @default
      */
      @Excel(name = "字典类型", orderNum = "3", width = 20)
      private String dictType;
@@ -56,7 +53,7 @@ public class SysDictData  extends CyIdIncreEntity<SysDictData> {
      /**
      * @desc 样式属性（其他样式扩展）
      * @column css_class
-     * @default 
+     * @default
      */
      @Excel(name = "样式属性（其他样式扩展）", orderNum = "4", width = 20)
      private String cssClass;
@@ -64,7 +61,7 @@ public class SysDictData  extends CyIdIncreEntity<SysDictData> {
      /**
      * @desc 表格回显样式
      * @column list_class
-     * @default 
+     * @default
      */
      @Excel(name = "表格回显样式", orderNum = "5", width = 20)
      private String listClass;
@@ -72,7 +69,7 @@ public class SysDictData  extends CyIdIncreEntity<SysDictData> {
      /**
      * @desc 是否默认（y是 n否）
      * @column is_default
-     * @default 
+     * @default
      */
      @Excel(name = "是否默认（y是 n否）", orderNum = "6", width = 20)
      private String isDefault;

src/main/java/org/rcisoft/sys/sysuser/service/SysUserService.java

@@ -5,6 +5,7 @@ import org.rcisoft.core.model.CyPersistModel;
 import org.rcisoft.core.model.CyPageInfo;
 import org.rcisoft.sys.rbac.user.dto.ImportUserDTO;
 import org.rcisoft.sys.sysuser.dto.ExportUserDTO;
+import org.rcisoft.sys.sysuser.entity.SysDictData;
 import org.rcisoft.sys.sysuser.entity.SysUser;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -119,4 +120,5 @@ public interface SysUserService {
      */
     public SysUser getUserDataByPersonId(String personId);
 
+    CyPersistModel removeDictLogical(SysDictData data);
 }

src/main/java/org/rcisoft/sys/sysuser/service/impl/SysUserServiceImpl.java

@@ -646,6 +646,22 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
         return sysUserRepositorys.querySysUsersByPersonId(personId);
     }
 
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
+    @Override
+    public CyPersistModel removeDictLogical(SysDictData data) {
+        SysDictData queryDicData = new SysDictData();
+        queryDicData.setDictType(data.getDictType());
+        queryDicData.setDelFlag("0");
+        queryDicData.setFlag("1");
+        List<SysDictData> dictDataList = sysDictDataRepositorys.querySysDictDatas(queryDicData);
+        if (dictDataList.size() > 0) {
+            throw new CyServiceException(500, "已拥有字典数据，不能删除");
+        }
+        int [] types = {data.getBusinessId()};
+        int line = dictDataRepository.deleteDataByIds(types);
+        return new CyPersistModel(line);
+    }
+
     /**
      * 去除List中空数据
      *