From c80371d18a02a004f58a5158a9ca8f04d16f1eb2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 18 Jun 2020 18:53:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86v3:?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/RequirePermissionEnum.java | 12 +++++++++++- .../controller/PartyBranchManageController.java | 8 ++++++++ .../feign/ResiPartyMemberOpenFeignClient.java | 2 +- .../controller/PartymemberBaseInfoController.java | 1 + 4 files changed, 21 insertions(+), 2 deletions(-) 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 05b505594b..e5e5bb9a2d 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 @@ -106,7 +106,17 @@ public enum RequirePermissionEnum { WORK_PARTY_VOICE_PUBLISH("work_party_voice_publish", "党建声音:创建文章", ""), WORK_PARTY_VOICE_EDIT("work_party_voice_edit", "党建声音:重新编辑", ""), WORK_PARTY_VOICE_OFFLINE("work_party_voice_offline", "党建声音:下线文章", ""), - WORK_PARTY_VOICE_OPERATION_LIST("work_party_voice_operation_list","党建声音:查看文章操作记录",""); + WORK_PARTY_VOICE_OPERATION_LIST("work_party_voice_operation_list","党建声音:查看文章操作记录",""), + + /** + * 基层治理-支部管理 + */ + WORK_GRASSROOTS_PARTY_BRANCH_ADD("work_grassroots_party_branch_add","添加党支部","支部管理-添加党支部"), + WORK_GRASSROOTS_PARTY_BRANCH_EDIT("work_grassroots_party_branch_edit","编辑党支部","支部管理-编辑党支部信息"), + WORK_GRASSROOTS_PARTY_BRANCH_DELETE("work_grassroots_party_branch_delete","删除党支部","支部管理-删除党支部"), + WORK_GRASSROOTS_PARTY_MEMBER_ADD("work_grassroots_party_member_add","添加党员","支部管理-添加党员"), + WORK_GRASSROOTS_PARTY_MEMBER_EDIT("work_grassroots_party_member_edit","编辑党员","支部管理-编辑党员"), + WORK_GRASSROOTS_PARTY_MEMBER_DELETE("work_grassroots_party_member_delete","删除党员","支部管理-删除党员"); private String key; diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java index 02f15fdc7e..c74412719a 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java @@ -1,5 +1,7 @@ package com.epmet.controller; +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.form.*; @@ -33,6 +35,7 @@ public class PartyBranchManageController { * @Date 2020/6/17 12:47 **/ @PostMapping("add") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_BRANCH_ADD) public Result addPartyBranch(@RequestBody PartyBranchAddFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, PartyBranchAddFormDTO.AddUserShowGroup.class, PartyBranchAddFormDTO.AddUserInternalGroup.class); PartyBranchAddResultDTO partyBranchAddResultDTO = partyBranchManageService.addPartyBranch(formDTO); @@ -47,6 +50,7 @@ public class PartyBranchManageController { * @Date 2020/6/17 15:31 **/ @PostMapping("edit") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_BRANCH_EDIT) public Result editPartyBranch(@RequestBody PartyBranchEditFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, PartyBranchEditFormDTO.AddUserShowGroup.class, PartyBranchEditFormDTO.AddUserInternalGroup.class); partyBranchManageService.editPartyBranch(formDTO); @@ -76,6 +80,7 @@ public class PartyBranchManageController { * @Date 2020/6/17 18:23 **/ @PostMapping("delete") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_BRANCH_DELETE) public Result deleteBranch(@RequestBody PartyBranchIdFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); partyBranchManageService.deleteBranch(formDTO.getPartyBranchId()); @@ -118,6 +123,7 @@ public class PartyBranchManageController { * @Date 2020/6/17 22:25 **/ @PostMapping("/partymember/add") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_MEMBER_ADD) public Result addPartyMember(@RequestBody SaveOrUpdateParyMemberFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, SaveOrUpdateParyMemberFormDTO.AddUserShowGroup.class , SaveOrUpdateParyMemberFormDTO.SavePatyMemberGroup.class); @@ -134,6 +140,7 @@ public class PartyBranchManageController { * @Date 2020/6/17 23:29 **/ @PostMapping("/partymember/edit") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_MEMBER_EDIT) public Result editPartyMember(@RequestBody SaveOrUpdateParyMemberFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, SaveOrUpdateParyMemberFormDTO.AddUserShowGroup.class , SaveOrUpdateParyMemberFormDTO.UpdatePatyMemberGroup.class); @@ -163,6 +170,7 @@ public class PartyBranchManageController { * @Date 2020/6/18 17:51 **/ @PostMapping("partymember/delete") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_MEMBER_DELETE) public Result deletePartyMember(@RequestBody DeletePartyMemberFormDTO deletePartyMemberFormDTO){ ValidatorUtils.validateEntity(deletePartyMemberFormDTO, DeletePartyMemberFormDTO.AddUserInternalGroup.class); partyBranchManageService.deletePartyMember(deletePartyMemberFormDTO); diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index d427d00fc0..dbd66a9ed2 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -70,6 +70,6 @@ public interface ResiPartyMemberOpenFeignClient { * @description 删除党员 * @Date 2020/6/18 17:57 **/ - @GetMapping(value = "/resi/partymember/partymemberbaseinfo/delete", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + @PostMapping(value = "/resi/partymember/partymemberbaseinfo/delete", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result deltePartyMemberBaseInfo(@RequestBody DelPartyMemberBaseInfoFormDTO formDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java index 1149f73def..37b24fd4e2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java @@ -172,6 +172,7 @@ public class PartymemberBaseInfoController { **/ @PostMapping("delete") public Result deltePartyMemberBaseInfo(@RequestBody DelPartyMemberBaseInfoFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,DelPartyMemberBaseInfoFormDTO.AddUserInternalGroup.class); partymemberBaseInfoService.deltePartyMemberBaseInfo(formDTO); return new Result(); }