Merge branch 'role-apply-update-230718' into 'release/v1.2.0'

Role apply update 230718

See merge request dcuc-tjdsj/auth-back!168

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

@@ -11,6 +11,8 @@ import com.dragoninfo.dcuc.auth.auth.facade.IRoleAuthInfoFacade;
 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.zerotrust.roleauthapply.ApplyRoleInVo;
+import com.dragoninfo.dcuc.auth.auth.vo.zerotrust.roleauthapply.RoleAuthApplySaveVo;
 import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
 import com.dragoninfo.dcuc.auth.sub.enumresource.JobTypeEnum;
 import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
@@ -19,7 +21,6 @@ import com.dragoninfo.dcuc.auth.sub.vo.LabelVO;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.StaffOperateVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.StaffRoleOperateVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.UserRoleAuthInfoVo;
-import com.dragoninfo.dcuc.duceap.enums.UserTypeEnum;
 import com.dragoninfo.dcuc.duceap.facade.ICodeListResourceFacade;
 import com.dragoninfo.duceap.core.response.Result;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
@@ -254,17 +255,21 @@ public class RoleAuthInfoController {
      */
     @ApiOperation(value = "人员视图保存")
     @PostMapping (value = "/staff")
-    public Result saveStaff(@RequestBody StaffOperateVo staffOperateVo) {
+    public Result<Object> saveStaff(@RequestBody StaffOperateVo staffOperateVo) {
         String userId = staffOperateVo.getUserId();
         String orgId = staffOperateVo.getOrgId();
         String saveIds = JSON.toJSONString(staffOperateVo.getSaveIds());
         String deleteIds = JSON.toJSONString(staffOperateVo.getDeleteIds());
         StaffAssignDTO staffAssignDTO=new StaffAssignDTO(userId, orgId, saveIds, deleteIds);
         ResponseStatus responseStatus = staffAssignAuthInfoFacade.saveStaff(staffAssignDTO);
-        Result result = new Result(responseStatus.getStatusCode(),responseStatus.getMessage(),null,null);
+        Result<Object> result = getResult(responseStatus);
         return result;
     }
 
+    private Result<Object> getResult(ResponseStatus responseStatus) {
+        return new Result<>(responseStatus.getStatusCode(), responseStatus.getMessage(),null,null);
+    }
+
     /**
      * 获取角色视图勾选人员
      * 获取人员视图勾选角色
@@ -290,4 +295,18 @@ public class RoleAuthInfoController {
         return Result.success(collect);
     }
 
+    @ApiOperation(value = "角色授权申请")
+    @PostMapping(value = "role-auth-apply")
+    public Result<Object> roleAuthApply(@RequestBody RoleAuthApplySaveVo saveVo) {
+        ResponseStatus responseStatus = iRoleAuthInfoFacade.roleAuthApply(saveVo);
+        return getResult(responseStatus);
+    }
+
+    @ApiOperation(value = "角色授权申请角色列表")
+    @PostMapping(value = "apply-role-list")
+    public Result<List<ApplyRoleInVo>> applyRoleList(SearchDTO searchDTO) {
+        List<ApplyRoleInVo> roleList = iRoleAuthInfoFacade.applyRoleList(searchDTO);
+        return Result.success(roleList);
+    }
+
 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/sub/SubSyncController.java

@@ -103,6 +103,17 @@ public class SubSyncController {
         }
     }
 
+    @ApiOperation(value = "授权主体-烽火应用信息同步")
+    @GetMapping(value = "fhAppSync")
+    public Result fhAppSync() {
+        ResponseStatus response = resourceFacade.fhAppSync();
+        if (ResponseStatus.SUCCESS_CODE.equals(response.getStatusCode())) {
+            return Result.success();
+        } else {
+            return Result.failMessage(response.getMessage());
+        }
+    }
+
     @ApiOperation(value = "授权主体-数据分级同步")
     @GetMapping(value = "dataLevelSync")
     public Result dataLevelSync() {