Эх сурвалжийг харах

基础和角色系统预制

于继渤 2 жил өмнө
parent
commit
85fc48069a

+ 2 - 2
src/main/java/com/dk/mdm/controller/mst/DictionaryDataController.java

@@ -78,7 +78,7 @@ public class DictionaryDataController{
      */
     @PostMapping("disable/{id}")
     public ResponseResultVO<Boolean> disable(@PathVariable String id) {
-        return this.getService().disable(id);
+        return dictionaryDataService.disable(id);
     }
 
     @PostMapping("count_by_cond_money_account/{id}")
@@ -94,7 +94,7 @@ public class DictionaryDataController{
      */
     @PostMapping("enable/{id}")
     public ResponseResultVO<Boolean> enable(@PathVariable String id) {
-        return this.getService().enable(id);
+        return dictionaryDataService.enable(id);
     }
 
 

+ 2 - 2
src/main/java/com/dk/mdm/controller/mst/RoleController.java

@@ -83,7 +83,7 @@ public class RoleController{
      */
     @PostMapping("disable/{id}")
     public ResponseResultVO<Boolean> disable(@PathVariable String id) {
-        return this.getService().disable(id);
+        return roleService.disable(id);
     }
 
     /**
@@ -93,7 +93,7 @@ public class RoleController{
      */
     @PostMapping("enable/{id}")
     public ResponseResultVO<Boolean> enable(@PathVariable String id) {
-        return this.getService().enable(id);
+        return roleService.enable(id);
     }
 
     /**

+ 2 - 1
src/main/java/com/dk/mdm/mapper/mst/DictionaryDataMapper.xml

@@ -30,7 +30,7 @@
     </resultMap>
 
     <sql id="Base_Column_List_Response">
-        data_id, dict_code, data_value, display_no, remarks, flg_valid, cp_id, data_code, flg_default
+        data_id, dict_code, data_value, display_no, remarks, flg_valid, cp_id, data_code, flg_default,sys_code
     </sql>
 
     <resultMap id="BaseResultMapResponse" type="com.dk.mdm.model.response.mst.DictionaryDataResponse">
@@ -43,6 +43,7 @@
         <result column="cp_id" property="cpId"/>
         <result column="data_code" property="dataCode"/>
         <result column="flg_default" property="flgDefault"/>
+        <result column="sys_code" property="sysCode"/>
     </resultMap>
 
     <!-- 通用条件列 -->

+ 46 - 0
src/main/java/com/dk/mdm/service/mst/DictionaryDataService.java

@@ -2,7 +2,9 @@ package com.dk.mdm.service.mst;
 
 import com.dk.common.infrastructure.annotaiton.Pagination;
 import com.dk.common.infrastructure.constant.Constant;
+import com.dk.common.infrastructure.enums.ErrorCodeEnum;
 import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.infrastructure.convert.mst.DictionaryDataConvert;
@@ -108,7 +110,51 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
 	)
 	public ResponseResultVO<?> update(DictionaryDataVO dictionaryDataVO) {
 		DictionaryData dictionaryData = dictionaryDataConvert.convertToPo(dictionaryDataVO);
+		DictionaryData dictionaryDataItem = dictionaryDataMapper.selectById(dictionaryDataVO.getDataId());
+		if (dictionaryDataItem.getSysCode() != null) {
+			//系统预制 无法编辑
+			return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SYSTEM_PRESET_DATA_UNABLE_TO_OPERATE.getMessage());
+		}
 		super.updateByUuid(dictionaryData);
+
+		return ResponseResultUtil.success();
+	}
+
+	/**
+	 * @desc : 停用
+	 * @author : 于继渤
+	 * @date :  2023/1/4 9:39
+	 */
+	@Transactional(
+			rollbackFor = {Exception.class}
+	)
+	public ResponseResultVO<Boolean> disable(String id) {
+		DictionaryData dictionaryDataItem = dictionaryDataMapper.selectById(id);
+		if (dictionaryDataItem.getSysCode() != null) {
+			//系统预制 无法编辑
+			return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SYSTEM_PRESET_DATA_UNABLE_TO_OPERATE.getMessage());
+		}
+		super.disable(id);
+
+		return ResponseResultUtil.success();
+	}
+
+	/**
+	 * @desc : 启用
+	 * @author : 于继渤
+	 * @date :  2023/1/4 9:39
+	 */
+	@Transactional(
+			rollbackFor = {Exception.class}
+	)
+	public ResponseResultVO<Boolean> enable(String id) {
+		DictionaryData dictionaryDataItem = dictionaryDataMapper.selectById(id);
+		if (dictionaryDataItem.getSysCode() != null) {
+			//系统预制 无法编辑
+			return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SYSTEM_PRESET_DATA_UNABLE_TO_OPERATE.getMessage());
+		}
+		super.enable(id);
+
 		return ResponseResultUtil.success();
 	}
 

+ 11 - 1
src/main/java/com/dk/mdm/service/mst/RoleFunService.java

@@ -1,7 +1,11 @@
 package com.dk.mdm.service.mst;
 
+import com.dk.common.infrastructure.enums.ErrorCodeEnum;
+import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
+import com.dk.mdm.mapper.mst.RoleMapper;
+import com.dk.mdm.model.pojo.mst.Role;
 import com.dk.mdm.model.pojo.mst.RoleFun;
 import com.dk.mdm.mapper.mst.RoleFunMapper;
 import com.dk.common.service.BaseService;
@@ -27,7 +31,8 @@ public class RoleFunService extends BaseService<RoleFun> {
     @Autowired
     private RoleFunMapper roleFunMapper;
 
-
+    @Autowired
+    private RoleMapper roleMapper;
     /**
      * @desc : 获取角色权限
      * @author : 于继渤
@@ -72,6 +77,11 @@ public class RoleFunService extends BaseService<RoleFun> {
             rollbackFor = {Exception.class}
     )
     public ResponseResultVO<Boolean> updateBatch(RoleVo roleVO) {
+        Role role1 = roleMapper.selectById(roleVO.getRoleId());
+        if (role1.getSysCode() != null) {
+            //系统预制 无法编辑
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SYSTEM_PRESET_DATA_UNABLE_TO_OPERATE.getMessage());
+        }
         if (roleVO.getRoleFunList() != null) {
             //删除历史功能权限
             deleteRoleId(roleVO.getRoleId());

+ 11 - 0
src/main/java/com/dk/mdm/service/mst/RoleSensitiveService.java

@@ -1,7 +1,11 @@
 package com.dk.mdm.service.mst;
 
+import com.dk.common.infrastructure.enums.ErrorCodeEnum;
+import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
+import com.dk.mdm.mapper.mst.RoleMapper;
+import com.dk.mdm.model.pojo.mst.Role;
 import com.dk.mdm.model.pojo.mst.RoleFun;
 import com.dk.mdm.model.pojo.mst.RoleSensitive;
 import com.dk.mdm.mapper.mst.RoleSensitiveMapper;
@@ -28,6 +32,8 @@ public class RoleSensitiveService extends BaseService<RoleSensitive> {
     @Autowired
     private RoleSensitiveMapper roleSensitiveMapper;
 
+    @Autowired
+    private RoleMapper roleMapper;
     /**
      * @desc : 获取角色敏感信息权限
      * @author : 于继渤
@@ -72,6 +78,11 @@ public class RoleSensitiveService extends BaseService<RoleSensitive> {
             rollbackFor = {Exception.class}
     )
     public ResponseResultVO<Boolean> updateBatch(RoleVo roleVO) {
+        Role role1 = roleMapper.selectById(roleVO.getRoleId());
+        if (role1.getSysCode() != null) {
+            //系统预制 无法编辑
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SYSTEM_PRESET_DATA_UNABLE_TO_OPERATE.getMessage());
+        }
         if (roleVO.getRoleSensitiveList() != null) {
             //删除历史功能权限
             deleteRoleId(roleVO.getRoleId());

+ 52 - 0
src/main/java/com/dk/mdm/service/mst/RoleService.java

@@ -2,11 +2,14 @@ package com.dk.mdm.service.mst;
 
 import com.dk.common.infrastructure.annotaiton.Pagination;
 import com.dk.common.infrastructure.constant.Constant;
+import com.dk.common.infrastructure.enums.ErrorCodeEnum;
 import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.infrastructure.convert.mst.RoleConvert;
 import com.dk.mdm.infrastructure.util.AuthUtils;
+import com.dk.mdm.model.pojo.mst.DictionaryData;
 import com.dk.mdm.model.pojo.mst.Role;
 import com.dk.mdm.mapper.mst.RoleMapper;
 import com.dk.common.service.BaseService;
@@ -124,6 +127,12 @@ public class RoleService extends BaseService<Role> {
             rollbackFor = {Exception.class}
     )
     public ResponseResultVO<?> updateRole(RoleVo roleVO) {
+
+        Role role1 = roleMapper.selectById(roleVO.getRoleId());
+        if (role1.getSysCode() != null) {
+            //系统预制 无法编辑
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SYSTEM_PRESET_DATA_UNABLE_TO_OPERATE.getMessage());
+        }
         Role role = roleConvert.convertToPo(roleVO);
         updateByUuid(role);
         if (roleVO.getRoleFunList() != null) {
@@ -177,11 +186,54 @@ public class RoleService extends BaseService<Role> {
             rollbackFor = {Exception.class}
     )
     public ResponseResultVO<?> update(RoleVo roleVO) {
+        Role role1 = roleMapper.selectById(roleVO.getRoleId());
+        if (role1.getSysCode() != null) {
+            //系统预制 无法编辑
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SYSTEM_PRESET_DATA_UNABLE_TO_OPERATE.getMessage());
+        }
         Role role = roleConvert.convertToPo(roleVO);
         updateByUuid(role);
         return ResponseResultUtil.success();
     }
 
 
+    /**
+     * @desc : 停用
+     * @author : 于继渤
+     * @date :  2023/1/4 9:39
+     */
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
+    public ResponseResultVO<Boolean> disable(String id) {
+        Role role = roleMapper.selectById(id);
+        if (role.getSysCode() != null) {
+            //系统预制 无法编辑
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SYSTEM_PRESET_DATA_UNABLE_TO_OPERATE.getMessage());
+        }
+        super.disable(id);
+
+        return ResponseResultUtil.success();
+    }
+
+    /**
+     * @desc : 启用
+     * @author : 于继渤
+     * @date :  2023/1/4 9:39
+     */
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
+    public ResponseResultVO<Boolean> enable(String id) {
+        Role role = roleMapper.selectById(id);
+        if (role.getSysCode() != null) {
+            //系统预制 无法编辑
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SYSTEM_PRESET_DATA_UNABLE_TO_OPERATE.getMessage());
+        }
+        super.enable(id);
+
+        return ResponseResultUtil.success();
+    }
+
 
 }