From 6be588e9c23aa7a13258f53a0ecd927abd461097 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 27 Aug 2021 14:09:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9D=A3=E5=8A=9E=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v2/SysRoleV2Controller.java | 2 ++ .../esua/epdc/feign/EventFeignClient.java | 32 +++++++++++++++++++ .../fallback/EventFeignClientFallback.java | 16 ++++++++++ .../esua/epdc/service/SysRoleService.java | 9 ++++++ .../epdc/service/impl/SysRoleServiceImpl.java | 21 ++++++++++++ 5 files changed, 80 insertions(+) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java index 69e876d..d821c15 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java @@ -63,6 +63,8 @@ public class SysRoleV2Controller { data.setWhistleDeptIdList(sysRoleService.getWhistleDeptIdList(id)); //查询角色对应的栏目权限 data.setModuleMenuIdList(sysRoleService.getModuleMenuIdList(id)); + //查询角色对应的督办部门权限 + data.setOverseeMenuIdList(sysRoleService.getOverseeMenuIdList(id)); return new Result().ok(data); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java index a769267..a780ff6 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.RoleOverseeDeptRelationDTO; import com.elink.esua.epdc.dto.handleroledept.form.HandleRoleDeptFormDTO; import com.elink.esua.epdc.dto.rulecategory.form.HandleRoleCategoryFormDTO; import com.elink.esua.epdc.feign.fallback.EventFeignClientFallback; @@ -10,6 +11,7 @@ import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import java.util.List; @@ -60,4 +62,34 @@ public interface EventFeignClient { **/ @GetMapping(value = "events/handleroledept/queryWhistleDeptIdList/{roleId}") Result> queryWhistleDeptIdList(@PathVariable("roleId") Long roleId); + + /** + * @describe: 保存角色督办部门关系 + * @author wangtong + * @date 2021/8/26 17:43 + * @params [overseeDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping(value = "events/roledifficultdept/saveRoleOverseeRelation", consumes = MediaType.APPLICATION_JSON_VALUE) + Result saveRoleOverseeRelation(RoleOverseeDeptRelationDTO overseeDto); + + /** + * @describe: 更新角色督办部门关系 + * @author wangtong + * @date 2021/8/27 9:29 + * @params [overseeDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PutMapping(value = "events/roledifficultdept/updateRoleOverseeRelation", consumes = MediaType.APPLICATION_JSON_VALUE) + Result updateRoleOverseeRelation(RoleOverseeDeptRelationDTO overseeDto); + + /** + * @describe: 查询角色对应的督办部门权限 + * @author wangtong + * @date 2021/8/27 9:34 + * @params [roleId] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping(value = "events/roledifficultdept/getOverseeMenuIdList/{roleId}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> getOverseeMenuIdList(@PathVariable("roleId")Long roleId); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java index ecbaa9b..c500a58 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.RoleOverseeDeptRelationDTO; import com.elink.esua.epdc.dto.handleroledept.form.HandleRoleDeptFormDTO; import com.elink.esua.epdc.dto.rulecategory.form.HandleRoleCategoryFormDTO; import com.elink.esua.epdc.feign.EventFeignClient; @@ -38,4 +39,19 @@ public class EventFeignClientFallback implements EventFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryWhistleDeptIdList", roleId); } + @Override + public Result saveRoleOverseeRelation(RoleOverseeDeptRelationDTO overseeDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "saveRoleOverseeRelation", overseeDto); + } + + @Override + public Result updateRoleOverseeRelation(RoleOverseeDeptRelationDTO overseeDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "updateRoleOverseeRelation", overseeDto); + } + + @Override + public Result> getOverseeMenuIdList(Long roleId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getOverseeMenuIdList", roleId); + } + } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java index 6b27e37..4842530 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java @@ -59,4 +59,13 @@ public interface SysRoleService extends BaseService { * @return java.util.List */ List getModuleMenuIdList(Long id); + + /** + * @describe: 查询角色对应的督办部门权限 + * @author wangtong + * @date 2021/8/27 9:32 + * @params [id] + * @return java.util.List + */ + List getOverseeMenuIdList(Long id); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java index 7cd8050..0ba5d05 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java @@ -29,6 +29,7 @@ import com.elink.esua.epdc.dao.SysDeptDao; import com.elink.esua.epdc.dao.SysRoleDao; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.RoleModuleRealationDTO; +import com.elink.esua.epdc.dto.RoleOverseeDeptRelationDTO; import com.elink.esua.epdc.dto.SysRoleDTO; import com.elink.esua.epdc.dto.handleroledept.HandleRoleDeptDTO; import com.elink.esua.epdc.dto.handleroledept.form.HandleRoleDeptFormDTO; @@ -159,6 +160,12 @@ public class SysRoleServiceImpl extends BaseServiceImpl getOverseeMenuIdList(Long id) { + Result> result = eventFeignClient.getOverseeMenuIdList(id); + return result.getData(); + } + /** * @param roleId * @param whistleDeptIdList