Merge remote-tracking branch 'origin/feature/difficult_oversee'

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<SysRoleDTO>().ok(data);
     }

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<List<Long>> 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<java.util.List<java.lang.Long>>
+	*/
+	@GetMapping(value = "events/roledifficultdept/getOverseeMenuIdList/{roleId}", consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result<List<Long>> getOverseeMenuIdList(@PathVariable("roleId")Long roleId);
 }

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<List<Long>> getOverseeMenuIdList(Long roleId) {
+		return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getOverseeMenuIdList", roleId);
+	}
+
 }

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java

@@ -59,4 +59,13 @@ public interface SysRoleService extends BaseService<SysRoleEntity> {
     * @return java.util.List<java.lang.Long>
     */
     List<Long> getModuleMenuIdList(Long id);
+
+    /**
+    * @describe: 查询角色对应的督办部门权限
+    * @author wangtong
+    * @date 2021/8/27 9:32
+    * @params [id]
+    * @return java.util.List<java.lang.Long>
+    */
+    List<Long> getOverseeMenuIdList(Long id);
 }

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<SysRoleDao, SysRoleEntit
         moduleDto.setModuleMenuIdList(dto.getModuleMenuIdList());
         newsFeignClient.saveRoleModuleRealation(moduleDto);
 
+        //保存角色督办部门关系
+        RoleOverseeDeptRelationDTO overseeDto = new RoleOverseeDeptRelationDTO();
+        overseeDto.setId(entity.getId());
+        overseeDto.setOverseeMenuIdList(dto.getOverseeMenuIdList());
+        eventFeignClient.saveRoleOverseeRelation(overseeDto);
+
         handleEpdcUserRole(dto, entity, true);
     }
 
@@ -270,6 +277,14 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
         moduleDto.setModuleMenuIdList(dto.getModuleMenuIdList());
         newsFeignClient.updateRoleModuleRealation(moduleDto);
 
+        newsFeignClient.updateRoleModuleRealation(moduleDto);
+
+        //更新角色督办部门关系
+        RoleOverseeDeptRelationDTO overseeDto = new RoleOverseeDeptRelationDTO();
+        overseeDto.setId(entity.getId());
+        overseeDto.setOverseeMenuIdList(dto.getOverseeMenuIdList());
+        eventFeignClient.updateRoleOverseeRelation(overseeDto);
+
         handleEpdcUserRole(dto, entity, true);
     }
 
@@ -322,6 +337,12 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
         return result.getData();
     }
 
+    @Override
+    public List<Long> getOverseeMenuIdList(Long id) {
+        Result<List<Long>> result = eventFeignClient.getOverseeMenuIdList(id);
+        return result.getData();
+    }
+
     /**
      * @param roleId
      * @param whistleDeptIdList