diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java index 3e39d03c04..878d3ef1d4 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java @@ -1,23 +1,50 @@ package com.epmet.commons.tools.enums; +/** + * @author wxz + * 政府端功能操作權限 + */ public enum RequirePermissionEnum { + /** + * 工作-基层治理-群组管理 + */ WORK_GRASSROOTS_GROUP_AUDITINGLIST("work_grassroots_group_auditinglist", "基层治理:群组管理:待审核列表", "基层治理:群组管理:待审核列表"), WORK_GRASSROOTS_GROUP_AUDIT("work_grassroots_group_audit", "基层治理:群组管理:审核建组", "基层治理:群组管理:审核建组"), WORK_GRASSROOTS_GROUP_GROUPSINTHEGRID("work_grassroots_group_groupsinthegrid", "基层治理:群组管理:本网格小组列表", "基层治理:群组管理:本网格小组列表"), + /** + * 工作-基层治理-居民管理 + */ WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITINGLIST("work_grassroots_resi_warmhearted_auditinglist", "基层治理:居民管理:热心居民待审核列表", "基层治理:居民管理:热心居民待审核列表"), WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITHISTORYLIST("work_grassroots_resi_warmhearted_audithistorylist", "基层治理:居民管理:热心审核历史", "基层治理:居民管理:热心审核历史"), WORK_GRASSROOTS_RESI_WARMHEARTED_AUDIT("work_grassroots_resi_warmhearted_audit", "基层治理:居民管理:热心居民审核", "基层治理:居民管理:热心居民审核"), + /** + * 工作-基层治理-党员认证 + */ + WORK_PARTYAUTH_AUDITINGLIST("work_partyauth_auditinglist","基层治理:党员认证:待审核列表","基层治理:党员认证:待审核列表"), + WORK_PARTYAUTH_AUDITEDLIST("work_partyauth_auditedlist","基层治理:党员认证:已认证列表","基层治理:党员认证:已认证列表"), + WORK_PARTYAUTH_AUDITHISTORY("work_partyauth_audithistory","基层治理:党员认证:审核历史","基层治理:党员认证:审核历史"), + WORK_PARTYAUTH_AUDITSUBMIT("work_partyauth_auditsubmit","基层治理:党员认证:审核","基层治理:党员认证:审核"), + + /** + * 组织-机关单位 + */ ORG_AGENCY_TRACE("org_agency_trace", "组织:查看上级机关", "组织:查看上级机关"), ORG_AGENCY_UPDATE("org_agency_update", "组织:机关单位:编辑", "组织:机关单位:编辑"), ORG_SUBAGENCY_LIST("org_subagency_list", "组织:下级机关:列表", "组织:下级机关:列表"), ORG_SUBAGENCY_CREATE("org_subagency_create", "组织:下级机关:新增", "组织:下级机关:新增"), ORG_SUBAGENCY_DELETE("org_subagency_delete", "组织:下级机关:删除", "组织:下级机关:删除"), + /** + * 组织-工作人员 + */ ORG_STAFF_DETAIL("org_staff_detail", "组织:工作人员:详情", "组织:工作人员:详情"), ORG_STAFF_LIST("org_staff_list", "组织:工作人员:列表", "组织:工作人员:列表"), ORG_STAFF_CREATE("org_staff_create", "组织:工作人员:新增", "组织:工作人员:新增"), ORG_STAFF_UPDATE("org_staff_update", "组织:工作人员:编辑", "组织:工作人员:编辑"), ORG_STAFF_FORBIDDEN("org_staff_forbidden", "组织:工作人员:禁用", "组织:工作人员:禁用"), + /** + * 组织-部门 + */ ORG_DEPARTMENT_LIST("org_department_list", "组织:直属部门:部门列表", "组织:直属部门:部门列表"), ORG_DEPARTMENT_CREATE("org_department_create", "组织:直属部门:新增部门", "组织:直属部门:新增部门"), ORG_DEPARTMENT_UPDATE("org_department_update", "组织:直属部门:编辑部门", "组织:直属部门:编辑部门"), @@ -25,6 +52,9 @@ public enum RequirePermissionEnum { ORG_DEPARTMENT_STAFF_ADD("org_department_staff_add", "组织:直属部门:添加人员", "组织:直属部门:添加人员"), ORG_DEPARTMENT_STAFF_REMOVE("org_department_staff_remove", "组织:直属部门:移除人员", "组织:直属部门:移除人员"), ORG_DEPARTMENT_STAFF_LIST("org_department_staff_list", "组织:直属部门:人员列表", "组织:直属部门:人员列表"), + /** + * 组织-网格 + */ ORG_GRID_LIST("org_grid_list", "组织:治理网格:网格列表", "组织:治理网格:网格列表"), ORG_GRID_CREATE("org_grid_create", "组织:治理网格:新增网格", "组织:治理网格:新增网格"), ORG_GRID_UPDATE("org_grid_update", "组织:治理网格:编辑网格", "组织:治理网格:编辑网格"), diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java index 967e9776dd..c520c9bd86 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java @@ -1,6 +1,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -47,6 +49,7 @@ public class ResiGroupController { * @return Result> */ @PostMapping("groupsingrid") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_GROUPSINTHEGRID) public Result> getGroupsInGrid(@RequestBody GroupAuditedFromDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiGroupService.getGroupsInGrid(formDTO); @@ -71,6 +74,7 @@ public class ResiGroupController { * @Author wangc * @Date 2020.04.20 13:59 **/ + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_AUDITINGLIST) @PostMapping("auditing") public Result> auditing(@LoginUser TokenDto tokenDto, @RequestBody ApplyingGroupsFormDTO applyingGroupsFormDTO){ applyingGroupsFormDTO.setUserId(tokenDto.getUserId()); @@ -100,6 +104,7 @@ public class ResiGroupController { * @Date 2020.04.20 14:25 **/ @PostMapping("approve") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_AUDIT) public Result agreeApplying(@LoginUser TokenDto tokenDto, @RequestBody AgreeApplyGroupFormDTO agreeApplyGroupFormDTO){ agreeApplyGroupFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(agreeApplyGroupFormDTO); @@ -114,6 +119,7 @@ public class ResiGroupController { * @Date 2020.04.20 14:26 **/ @PostMapping("reject") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_AUDIT) public Result disagreeApplying(@LoginUser TokenDto tokenDto, @RequestBody DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO){ disAgreeApplyGroupFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(disAgreeApplyGroupFormDTO); diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java index c3cacb7575..1ac93d3c4f 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java @@ -1,6 +1,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -47,6 +49,7 @@ public class ResiPartyMemberController { * @Date 2020/4/26 16:04 **/ @PostMapping("auditing") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITINGLIST) public Result> auditing(@RequestBody AuditingPartyMemberFormDTO formDTO) { return resiPartyMemberService.auditing(formDTO); } @@ -59,6 +62,7 @@ public class ResiPartyMemberController { * @Date 2020/4/26 23:31 **/ @PostMapping("audited") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITHISTORY) public Result> audited(@RequestBody AuditedPartyMemberFormDTO formDTO) { return resiPartyMemberService.audited(formDTO); } @@ -72,6 +76,7 @@ public class ResiPartyMemberController { * @CreatedTime 2020/4/26 16:18 */ @PostMapping(value = "/certified") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITEDLIST) public Result> certifiedList(@LoginUser TokenDto tokenDto, @RequestBody CertifiedFormDTO certifiedFormDTO){ return resiPartyMemberService.certifiedList(certifiedFormDTO); } @@ -96,6 +101,7 @@ public class ResiPartyMemberController { * @author zhaoqifeng */ @PostMapping("audit") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITSUBMIT) public Result manualConfirmResult(@RequestBody PartyMemberConfirmFromDTO fromDTO) { ValidatorUtils.validateEntity(fromDTO); return resiPartyMemberService.manualConfirmResult(fromDTO); diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiWarmheartedController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiWarmheartedController.java index 47181d2db8..d2c5ae81ef 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiWarmheartedController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiWarmheartedController.java @@ -1,6 +1,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -35,6 +37,7 @@ public class ResiWarmheartedController { * @param formDTO 参数 * @return */ + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITHISTORYLIST) @PostMapping("audited") public Result> audited(@RequestBody ResiWarmheartedAuditedFromDTO formDTO) { return resiWarmheartedService.audited(formDTO); @@ -46,6 +49,7 @@ public class ResiWarmheartedController { * @Description 政府端-获取待审核的热心居民申请列表 **/ @PostMapping("auditing") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITINGLIST) public Result> auditing(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmAuditFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiWarmheartedService.auditing(formDTO); @@ -57,6 +61,7 @@ public class ResiWarmheartedController { * @Description 政府端-热心居民申请-审核通过 **/ @PostMapping("approve") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_RESI_WARMHEARTED_AUDIT) public Result approve(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmAuditApproveFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiWarmheartedService.approve(formDTO); @@ -68,6 +73,7 @@ public class ResiWarmheartedController { * @Description 政府端-热心居民申请-审核驳回 **/ @PostMapping("reject") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_RESI_WARMHEARTED_AUDIT) public Result reject(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmAuditRejectFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiWarmheartedService.reject(formDTO); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java index 6d128501ed..538f30cff2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java @@ -18,6 +18,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -58,6 +60,7 @@ public class AgencyController { * @Description 添加组织 */ @PostMapping("addagency") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_SUBAGENCY_CREATE) public Result addAgency(@LoginUser TokenDto tokenDTO, @RequestBody AddAgencyFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); //机构级别是市级以上则市、区县名称可不传值，是区县级以上则区县名称可不传值 @@ -83,7 +86,7 @@ public class AgencyController { * @Description 组织名称编辑 */ @PostMapping("editagency") - //@RequirePermission(requirePermission = RequirePermissionEnum.ORG_AGENCY_UPDATE) + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_AGENCY_UPDATE) public Result editAgency(@LoginUser TokenDto tokenDTO, @RequestBody EditAgencyFormDTO formDTO) { formDTO.setUserId(tokenDTO.getUserId()); ValidatorUtils.validateEntity(formDTO); @@ -97,6 +100,7 @@ public class AgencyController { * @Description 删除组织机关 */ @PostMapping("removeagency") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_SUBAGENCY_DELETE) public Result removeAgency(@LoginUser TokenDto tokenDTO, @RequestBody RemoveAgencyFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return agencyService.removeAgency(formDTO); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java index c521ddc15d..7705d1247c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java @@ -1,6 +1,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -35,6 +37,7 @@ public class DepartmentController { * @return */ @PostMapping(value = "adddepartmentstaff") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_STAFF_ADD) public Result addDepartmentStaff(@LoginUser TokenDto tokenDto, @RequestBody AddDepartmentStaffFormDTO addDepartmentStaffFormDTO){ return departmentService.addDepartmentStaff(tokenDto,addDepartmentStaffFormDTO); } @@ -46,6 +49,7 @@ public class DepartmentController { * @Description 添加部门 */ @PostMapping("adddepartment") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_CREATE) public Result addDepartment(@LoginUser TokenDto tokenDTO, @RequestBody AddDepartmentFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return departmentService.addDepartment(formDTO); @@ -58,6 +62,7 @@ public class DepartmentController { * @Description 部门信息修改 */ @PostMapping("editdepartment") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_UPDATE) public Result editDepartment(@LoginUser TokenDto tokenDTO, @RequestBody EditDepartmentFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return departmentService.editDepartment(formDTO); @@ -70,6 +75,7 @@ public class DepartmentController { * @Description 删除部门 */ @PostMapping("removedepartment") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_DELETE) public Result removeDepartment(@LoginUser TokenDto tokenDTO, @RequestBody RemoveDepartmentFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return departmentService.removeDepartment(formDTO); @@ -135,6 +141,7 @@ public class DepartmentController { * @Date 2020.04.26 17:09 **/ @PostMapping("removestaff") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_STAFF_REMOVE) public Result removeStaff(@LoginUser TokenDto tokenDto,@RequestBody CommonDepartmentStaffInfoFormDTO departmentStaffInfoFormDTO){ departmentStaffInfoFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(departmentStaffInfoFormDTO); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java index c1d0b48b40..766df22011 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java @@ -1,6 +1,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.*; @@ -41,6 +43,7 @@ public class GridController { * 新建当前机关下的所属网格 */ @PostMapping("addgrid") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_CREATE) public Result addGrid(@LoginUser TokenDto tokenDto, @RequestBody AddGridFormDTO addGridFormDTO){ return customerGridService.addGrid(tokenDto,addGridFormDTO); @@ -50,6 +53,7 @@ public class GridController { * 管理员修改网格信息 */ @PostMapping("editgrid") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_UPDATE) public Result editGrid(@LoginUser TokenDto tokenDto, @RequestBody EditGridFormDTO editGridFormDTO){ return customerGridService.editGrid(tokenDto,editGridFormDTO); @@ -59,6 +63,7 @@ public class GridController { * 删除网格 */ @PostMapping("deletegrid") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_DELETE) public Result deleteGrid(@LoginUser TokenDto tokenDto, @RequestBody DeleteGridFormDTO deleteGridFormDTO){ return customerGridService.deleteGrid(tokenDto,deleteGridFormDTO); } @@ -114,6 +119,7 @@ public class GridController { * @Date 2020.04.26 15:36 **/ @PostMapping("addgridstaffs") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_STAFF_ADD) public Result addGridStaffs(@LoginUser TokenDto tokenDto, @RequestBody CommonGridStaffListFromDTO commonGridStaffListFromDTO){ commonGridStaffListFromDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(tokenDto); @@ -129,6 +135,7 @@ public class GridController { * @Date 2020.04.26 15:36 **/ @PostMapping("removegridstaff") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_STAFF_REMOVE) public Result removeGridStaff(@LoginUser TokenDto tokenDto, @RequestBody CommonGridStaffInfoFormDTO commonGridStaffInfoFormDTO){ commonGridStaffInfoFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(tokenDto); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index 1b8f109082..1c46d607ac 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -3,6 +3,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -82,6 +84,7 @@ public class StaffController { * @return Result */ @PostMapping("addstaff") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_CREATE) public Result addStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffSubmitFromDTO fromDTO){ ValidatorUtils.validateEntity(fromDTO); return staffService.addStaff(tokenDto, fromDTO); @@ -94,6 +97,7 @@ public class StaffController { * @return Result */ @PostMapping("editstaff") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_UPDATE) public Result editStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffSubmitFromDTO fromDTO){ ValidatorUtils.validateEntity(fromDTO); return staffService.editStaff(tokenDto, fromDTO); @@ -117,6 +121,7 @@ public class StaffController { * @return Result */ @PostMapping("disabledstaff") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_FORBIDDEN) public Result disabledStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffInfoFromDTO fromDTO){ return staffService.disabledStaff(tokenDto, fromDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java index 65c557df7e..54dd2f09f7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java @@ -1,8 +1,6 @@ package com.epmet.controller; import com.epmet.commons.mybatis.entity.DataScope; -import com.epmet.commons.tools.annotation.RequirePermission; -import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.GovStaffRoleDTO; @@ -21,13 +19,11 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - import java.util.ArrayList; import java.util.List; /** - * @return - * 工作人员相关api + * @return 工作人员相关api * @Author wxz * @Description * @Date 2020/4/22 22:44 @@ -44,6 +40,7 @@ public class StaffRoleController { /** * 查询工作人员具有的角色列表 + * * @return */ @PostMapping("staffroles") @@ -63,6 +60,7 @@ public class StaffRoleController { /** * 查询拥有指定角色的用户列表 + * * @param staffRoleFormDTO * @return */ @@ -72,32 +70,32 @@ public class StaffRoleController { ValidatorUtils.validateEntity(staffRoleFormDTO, StaffRoleFormDTO.GetStaffsInRole.class); String roleKey = staffRoleFormDTO.getRoleKey(); String orgId = staffRoleFormDTO.getOrgId(); - List staffRoleDTOS = staffRoleService.listStaffsInRole(roleKey, orgId , DataScope.getDefault()); + List staffRoleDTOS = staffRoleService.listStaffsInRole(roleKey, orgId, DataScope.getDefault()); return new Result>().ok(staffRoleDTOS); } /** + * @return Result * @Description 查询一个员工在指定客户下的角色 * @Param CommonUserFormDTO - * @return Result * @Author wangc * @Date 2020.04.26 13:06 **/ @PostMapping("getcustomerstaffroles") //@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_LIST) - public Result getCustomerStaffRoles(@RequestBody CommonUserFormDTO commonUserFormDTO){ + public Result getCustomerStaffRoles(@RequestBody CommonUserFormDTO commonUserFormDTO) { ValidatorUtils.validateEntity(commonUserFormDTO); return staffRoleService.getStaffRoles(commonUserFormDTO); } /** - * @Description 查找具有特定角色的人员Id(可用) * @param rolesUsersListFormDTO + * @Description 查找具有特定角色的人员Id(可用) * @author wangc * @date 2020.04.29 23:49 - **/ + **/ @PostMapping("specificrolesstaffs") - public Result> specificRolesStaffs(@RequestBody RolesUsersListFormDTO rolesUsersListFormDTO){ + public Result> specificRolesStaffs(@RequestBody RolesUsersListFormDTO rolesUsersListFormDTO) { return staffRoleService.getSpecificRolesStaffs(rolesUsersListFormDTO); } }