feature: 角色生命周期管理搬运先注释

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/RoleInfoController.java

@@ -8,11 +8,14 @@ import com.dragoninfo.dcuc.auth.auth.facade.IRoleInfoFacade;
 import com.dragoninfo.dcuc.auth.auth.facade.IStaffAssignAuthInfoFacade;
 import com.dragoninfo.dcuc.auth.auth.vo.RoleInfoVO;
 import com.dragoninfo.dcuc.auth.auth.vo.RsGridCheckedVO;
+import com.dragoninfo.dcuc.auth.auth.vo.rolemanage.RoleOperateApplyVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.RoleFunRsRlVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.RoleInfoVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.RoleQuotaVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.StaffAssignAuthInfoVo;
+import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragoninfo.duceap.core.response.Result;
+import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.base.entity.security.SecurityUser;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
@@ -34,6 +37,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -47,11 +51,24 @@ public class RoleInfoController {
 
 
     @Autowired
-    private IRoleInfoFacade iRoleInfoFacade;
+    private IRoleInfoFacade roleInfoFacade;
 
     @Autowired
     private IStaffAssignAuthInfoFacade iStaffAssignAuthInfoFacade;
 
+
+    @ApiOperation(value = "角色新增、修改、删除操作申请")
+    @PostMapping("role-operate-apply")
+    public Result<Object> roleOperateApply(@Valid @RequestBody RoleOperateApplyVo roleOperateApplyVo) {
+        ResponseDTO<Object> responseDTO = roleInfoFacade.roleOperateApply(roleOperateApplyVo);
+        if (ResponseUtil.isSuccess(responseDTO)) {
+            return Result.success();
+        } else {
+            return Result.failMessage(responseDTO.getMessage());
+        }
+    }
+
+
     /**
      * 角色列表
      *
@@ -62,7 +79,7 @@ public class RoleInfoController {
     @ApiImplicitParam(name = "searchable", value = "查询条件,app_id_eq不能为空")
     @PostMapping(value = "roleList/_search")
     public Result<List<RoleInfoVO>> roleList(SearchDTO searchDTO) {
-        Page<RoleInfoVO> roleInfoVOPage = iRoleInfoFacade.page(searchDTO);
+        Page<RoleInfoVO> roleInfoVOPage = roleInfoFacade.page(searchDTO);
         return Result.success(roleInfoVOPage.getTotalElements(), roleInfoVOPage.getContent());
     }
 
@@ -81,7 +98,7 @@ public class RoleInfoController {
             //DTO暂未设计,沿用原来的接口参数,后期修改
             String roleId = roleFunRsRlVo.getRoleId();
             String rsGridList = JSON.toJSONString(roleFunRsRlVo.getRsGridLists());
-            iRoleInfoFacade.saveRsGrid(rsGridList, roleId);
+            roleInfoFacade.saveRsGrid(rsGridList, roleId);
             result = Result.success("保存成功");
         } catch (Exception e) {
             logger.error("saveRsGrid error:{}", e);
@@ -102,7 +119,7 @@ public class RoleInfoController {
             , example = "40288a8b699fc2500169a33b20540000")})
     @GetMapping(value = "/role/{id}", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Result<RoleInfoVo> roleInfo(@PathVariable("id") String id) {
-        RoleInfo roleInfo = iRoleInfoFacade.get(id);
+        RoleInfo roleInfo = roleInfoFacade.get(id);
         RoleInfoVo vo = new RoleInfoVo();
         BeanUtils.copyProperties(roleInfo, vo);
         return Result.success(vo);
@@ -129,7 +146,7 @@ public class RoleInfoController {
             searchable.addSearchFilter("code", SearchOperator.eq, roleInfoVo.getCode());
             if (StringUtils.isNotEmpty(roleInfoVo.getId()))
                 searchable.addSearchFilter("id", SearchOperator.ne, roleInfoVo.getId());
-            List<RoleInfo> list = iRoleInfoFacade.roleList(searchable.toSearchDTO());
+            List<RoleInfo> list = roleInfoFacade.roleList(searchable.toSearchDTO());
             if (list != null && list.size() > 0)
                 return Result.fail("角色代码已被使用");
             SecurityUser user = (SecurityUser) ContextUtils.getUserInfo();
@@ -142,7 +159,7 @@ public class RoleInfoController {
             //DTO暂未设计,沿用原来的接口参数,后期修改
             RoleInfo roleInfo = new RoleInfo();
             BeanUtils.copyProperties(roleInfoVo, roleInfo);
-            iRoleInfoFacade.save(roleInfo);
+            roleInfoFacade.save(roleInfo);
             result = Result.success("保存成功");
 
         } catch (Exception e) {
@@ -174,10 +191,10 @@ public class RoleInfoController {
             searchable.addSearchFilter("code", SearchOperator.eq, roleInfoVo.getCode());
             if (StringUtils.isNotEmpty(roleInfoVo.getId()))
                 searchable.addSearchFilter("id", SearchOperator.ne, roleInfoVo.getId());
-            List<RoleInfo> list = iRoleInfoFacade.roleList(searchable.toSearchDTO());
+            List<RoleInfo> list = roleInfoFacade.roleList(searchable.toSearchDTO());
             if (list != null && list.size() > 0)
                 return Result.fail("角色代码已被使用");
-            RoleInfo role_info = iRoleInfoFacade.get(roleInfoVo.getId());
+            RoleInfo role_info = roleInfoFacade.get(roleInfoVo.getId());
             role_info.setCode(roleInfoVo.getCode());
             role_info.setName(roleInfoVo.getName());
             role_info.setRoleLevel(roleInfoVo.getRoleLevel());
@@ -187,7 +204,7 @@ public class RoleInfoController {
             role_info.setPoliceCategory(StringUtils.isEmpty(roleInfoVo.getPoliceCategory()) ? null : roleInfoVo.getPoliceCategory());
             role_info.setRoleBusiness(roleInfoVo.getRoleBusiness());
             role_info.setIsNotLimitCount(roleInfoVo.getIsNotLimitCount());
-            iRoleInfoFacade.update(role_info);
+            roleInfoFacade.update(role_info);
             result = Result.success("保存成功");
 
         } catch (Exception e) {
@@ -214,9 +231,9 @@ public class RoleInfoController {
         Result result;
         try {
             //删除角色信息
-            iRoleInfoFacade.delete(id);
+            roleInfoFacade.delete(id);
             //删除角色相关表的信息
-            iRoleInfoFacade.delAllRolesInfo(id);
+            roleInfoFacade.delAllRolesInfo(id);
             result = Result.success("删除成功");
         } catch (Exception e) {
             logger.error("delete role error:{}", e);
@@ -237,7 +254,7 @@ public class RoleInfoController {
     @ApiImplicitParam(name = "roleId", value = "角色id", required = true)
     @GetMapping(value = "/checked/{roleId}")
     public Result<List<RsGridCheckedVO>> checked(@PathVariable("roleId") String roleId) {
-        List<RsGridCheckedVO> rsGridCheckedVOList = iRoleInfoFacade.getRsGridChecked(roleId);
+        List<RsGridCheckedVO> rsGridCheckedVOList = roleInfoFacade.getRsGridChecked(roleId);
         return Result.success(rsGridCheckedVOList);
     }
 
@@ -259,7 +276,7 @@ public class RoleInfoController {
         if (StringUtils.isBlank(applicationId)){
             return Result.fail("400", "applicationId 不能为空");
         }
-        Page<RoleInfoVO> page = iRoleInfoFacade.getRoleQuotaList(searchDTO);
+        Page<RoleInfoVO> page = roleInfoFacade.getRoleQuotaList(searchDTO);
         return Result.success(page.getTotalElements(), page.getContent());
     }
 
@@ -288,7 +305,7 @@ public class RoleInfoController {
             searchable.addSearchFilter("role_level", SearchOperator.eq, roleLevel_eq.getValue());
         }
         searchable.addSearchFilter("is_not_limit_count", SearchOperator.eq, BooleanEnum.TRUE.value);
-        Page<RoleInfoVO> page = iRoleInfoFacade.getQuotoRoles(searchable.toSearchDTO());
+        Page<RoleInfoVO> page = roleInfoFacade.getQuotoRoles(searchable.toSearchDTO());
         return Result.success(page.getTotalElements(), page.getContent());
     }
 
@@ -305,7 +322,7 @@ public class RoleInfoController {
         Result result;
         try {
             String listStr = JSON.toJSONString(roleQuotaList);
-            iRoleInfoFacade.roleQuotaSave(listStr);
+            roleInfoFacade.roleQuotaSave(listStr);
             result = Result.success("保存成功");
         } catch (Exception e) {
             logger.error("role quota save error:{}", e);