政府端-基层治理-居民管理、群组管理、党员认证，组织机构所有接口添加操作权限

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java

@@ -9,15 +9,20 @@ 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_GROUP_AUDITINGLIST("work_grassroots_group_auditinglist", "基层治理:群组管理:待审核列表", "基层治理:群组管理:待审核列表查询"),
+    WORK_GRASSROOTS_GROUP_GROUPSINTHEGRID("work_grassroots_group_groupsinthegrid", "基层治理:群组管理:本网格小组列表", "基层治理:群组管理:本网格小组列表查询"),
+    WORK_GRASSROOTS_GROUP_AUDIT("work_grassroots_group_audit", "基层治理:群组管理:审核建组", "基层治理:群组管理:审核建组（通过或驳回）"),
+    WORK_GRASSROOTS_GROUP_AUDITED("work_grassroots_group_audited", "基层治理:群组管理:审核历史", "基层治理:群组管理:审核历史列表查询"),
+    WORK_GRASSROOTS_GROUP_APPLY_DETAIL("work_grassroots_group_apply_detail", "基层治理:群组管理:建组申请", "基层治理:群组管理:建组申请详情"),
+
     /**
      * 工作-基层治理-居民管理
      */
     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_GRASSROOTS_RESI_WARMHEARTED_APPLY_DETAIL("work_grassroots_resi_warmhearted_apply_detail", "基层治理:居民管理:热心居民申请详情", "基层治理:居民管理:查看热心居民申请详情"),
+
     /**
      * 工作-基层治理-党员认证
      */
@@ -25,6 +30,9 @@ public enum RequirePermissionEnum {
     WORK_PARTYAUTH_AUDITEDLIST("work_partyauth_auditedlist","基层治理:党员认证:已认证列表","基层治理:党员认证:已认证列表"),
     WORK_PARTYAUTH_AUDITHISTORY("work_partyauth_audithistory","基层治理:党员认证:审核历史","基层治理:党员认证:审核历史"),
     WORK_PARTYAUTH_AUDITSUBMIT("work_partyauth_auditsubmit","基层治理:党员认证:审核","基层治理:党员认证:审核"),
+    WORK_PARTYAUTH_AUDITED_DETAIL("work_partyauth_audited_detail", "基层治理:党员认证:已认证详情", "基层治理:党员认证:查看已认证党员详情"),
+    WORK_PARTYAUTH_AUDITING_DETAIL("work_partyauth_auditing_detail","基层治理:党员认证:待审核详情","基层治理:党员认证:查看待审核详情"),
+    WORK_PARTYAUTH_AUDITHISTORY_DETAIL("work_partyauth_audithistory_detail","基层治理:党员认证:审核历史详情","基层治理:党员认证:查看审核历史详情（自动审核失败、拒绝的）"),
 
     /**
      * 组织-机关单位
@@ -34,6 +42,7 @@ public enum RequirePermissionEnum {
     ORG_SUBAGENCY_LIST("org_subagency_list", "组织:下级机关:列表", "组织:下级机关:列表"),
     ORG_SUBAGENCY_CREATE("org_subagency_create", "组织:下级机关:新增", "组织:下级机关:新增"),
     ORG_SUBAGENCY_DELETE("org_subagency_delete", "组织:下级机关:删除", "组织:下级机关:删除"),
+
     /**
      * 组织-工作人员
      */
@@ -42,6 +51,7 @@ public enum RequirePermissionEnum {
     ORG_STAFF_CREATE("org_staff_create", "组织:工作人员:新增", "组织:工作人员:新增"),
     ORG_STAFF_UPDATE("org_staff_update", "组织:工作人员:编辑", "组织:工作人员:编辑"),
     ORG_STAFF_FORBIDDEN("org_staff_forbidden", "组织:工作人员:禁用", "组织:工作人员:禁用"),
+
     /**
      * 组织-部门
      */

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java

@@ -38,6 +38,7 @@ public class ResiGroupController {
 	 * @return
 	 */
 	@PostMapping("audited")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_AUDITED)
 	public Result<List<GroupAuditedResultDTO>> audited(@RequestBody GroupAuditedFromDTO formDTO) {
 		return resiGroupService.audited(formDTO);
 	}
@@ -90,6 +91,7 @@ public class ResiGroupController {
 	 * @Date 2020.04.20 14:08
 	 **/
 	@PostMapping("applygroupdetail")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_APPLY_DETAIL)
 	public Result<ApplyingGroupDetailResult2DTO> applyGroupDetail(@LoginUser TokenDto tokenDto, @RequestBody CommonGroupIdFromDTO groupIdFromDTO){
 		groupIdFromDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(groupIdFromDTO);

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java

@@ -89,6 +89,7 @@ public class ResiPartyMemberController {
      * @CreatedTime 2020/4/27 13:54
      */
     @PostMapping(value = "/certifieddetail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITED_DETAIL)
     public Result<CertifiedDetailResultDTO> certifiedDetail(@RequestBody CertifiedDetailFormDTO formDTO){
         return new Result<CertifiedDetailResultDTO>().ok(resiPartyMemberService.certifiedDetail(formDTO));
     }
@@ -115,6 +116,7 @@ public class ResiPartyMemberController {
      * @author zhaoqifeng
      */
     @PostMapping("auditingdetail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITING_DETAIL)
     public Result<AuditingDetailResultDTO> auditingDetail(@RequestBody AuditingDetailFromDTO fromDTO) {
         return resiPartyMemberService.auditingDetail(fromDTO);
     }
@@ -127,6 +129,7 @@ public class ResiPartyMemberController {
      * @author zhaoqifeng
      */
     @PostMapping("autofaileddetail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITHISTORY_DETAIL)
     public Result<AutoFailedDetailResultDTO> autoFailedDetail(@RequestBody AutoFailedDetailFromDTO fromDTO) {
         return resiPartyMemberService.autoFailedDetail(fromDTO);
     }
@@ -139,6 +142,7 @@ public class ResiPartyMemberController {
      * @author zhaoqifeng
      */
     @PostMapping("rejecteddetail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITHISTORY_DETAIL)
     public Result<RejectedDetailResultDTO> rejectedDetail(@RequestBody RejectedDetailFromDTO fromDTO) {
         return resiPartyMemberService.rejectedDetail(fromDTO);
     }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiWarmheartedController.java

@@ -37,8 +37,8 @@ public class ResiWarmheartedController {
 	 * @param formDTO 参数
 	 * @return
 	 */
-    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITHISTORYLIST)
 	@PostMapping("audited")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITHISTORYLIST)
     public Result<List<ResiWarmheartedAuditedResultDTO>> audited(@RequestBody ResiWarmheartedAuditedFromDTO formDTO) {
 		return resiWarmheartedService.audited(formDTO);
 	}
@@ -85,6 +85,7 @@ public class ResiWarmheartedController {
      * @Description 政府端-热心居民申请详情信息
      **/
     @PostMapping("getdetail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_RESI_WARMHEARTED_APPLY_DETAIL)
     public Result<ResiWarmAuditResultDTO> getDetail(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmGetDetailFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return resiWarmheartedService.getDetail(formDTO);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java

@@ -113,6 +113,7 @@ public class AgencyController {
      * @Description 组织首页-获取组织机构信息
      */
     @PostMapping("agencydetail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_AGENCY_TRACE)
     public Result<AgencysResultDTO> agencyDetail(@LoginUser TokenDto tokenDTO, @RequestBody AgencydetailFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return agencyService.agencyDetail(formDTO);
@@ -125,6 +126,7 @@ public class AgencyController {
      * @Description 组织首页-下级机关列表
      */
     @PostMapping("subagencylist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_SUBAGENCY_LIST)
     public Result<SubAgencyResultDTO> subAgencyList(@LoginUser TokenDto tokenDTO, @RequestBody SubAgencyFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return agencyService.subAgencyList(formDTO);
@@ -137,6 +139,7 @@ public class AgencyController {
      * @Description 获取组织列表
      */
     @PostMapping("agencylist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_SUBAGENCY_LIST)
     public Result<List<AgencyListResultDTO>> agencyList(@LoginUser TokenDto tokenDTO, @RequestBody AgencyListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return agencyService.agencyList(formDTO);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java

@@ -88,6 +88,7 @@ public class DepartmentController {
      * @Description 获取部门详情
      */
     @PostMapping("departmentdetail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_STAFF_LIST)
     public Result<DepartmentDetailResultDTO> departmentDetail(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentdetailFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return departmentService.departmentDetail(formDTO);
@@ -100,6 +101,7 @@ public class DepartmentController {
      * @Description 组织首页-获取机关下部门列表
      */
     @PostMapping("departmentinagencylist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_LIST)
     public Result<DepartmentInAgencyResultDTO> departmentInAgencyList(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentInAgencyFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return departmentService.departmentInAgencyList(formDTO);
@@ -112,6 +114,7 @@ public class DepartmentController {
      * @Description 获取机构下部门列表
      */
     @PostMapping("departmentlist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_LIST)
     public Result<List<DepartmentListResultDTO>> departmentList(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return departmentService.departmentList(formDTO);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java

@@ -76,6 +76,7 @@ public class GridController {
      * @Date 2020.04.23 14:45
      **/
     @PostMapping("gridlist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_LIST)
     public Result<GridListInfoResultDTO> gridList(@LoginUser TokenDto tokenDto,@RequestBody CommonAgencyIdFormDTO agencyFormDTO){
         agencyFormDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(agencyFormDTO);
@@ -90,6 +91,7 @@ public class GridController {
      * @Date 2020.04.23 14:45
      **/
     @PostMapping("allgrids")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_LIST)
     public Result<List<GridBaseInfoResultDTO>> allGrids(@LoginUser TokenDto tokenDto, @RequestBody CommonAgencyIdFormDTO agencyFormDTO){
         agencyFormDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(agencyFormDTO);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java

@@ -38,6 +38,7 @@ public class StaffController {
 	 * @return
 	 */
 	@PostMapping("staffsinagency")
+	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_LIST)
 	public Result<StaffsInAgencyResultDTO> getStaffInfoForHome(@RequestBody StaffsInAgencyFromDTO fromDTO) {
 		return staffService.getStaffInfoForHome(fromDTO);
 	}
@@ -73,6 +74,7 @@ public class StaffController {
 	 * @return Result<StaffInitResultDTO>
 	 */
 	@PostMapping("editstaffinit")
+	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_DETAIL)
 	public Result<StaffInitResultDTO> editStaffInit(@RequestBody StaffInfoFromDTO fromDTO){
 		return staffService.editStaffInit(fromDTO);
 	}
@@ -110,6 +112,7 @@ public class StaffController {
 	 * @return Result<StaffDetailResultDTO>
 	 */
 	@PostMapping("staffdetail")
+	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_DETAIL)
 	public Result<StaffDetailResultDTO> getStaffDetail(@RequestBody StaffInfoFromDTO fromDTO){
 		return staffService.getStaffDetail(fromDTO);
 	}