From 070e0cab6edfdc9a65b42075c048e706da362629 Mon Sep 17 00:00:00 2001 From: njcn_dhj <123456> Date: Sun, 9 Oct 2022 10:48:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=AD=90=E9=9B=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/user/api/DeptFeignClient.java | 6 ++++++ .../fallback/DeptFeignClientFallbackFactory.java | 5 +++++ .../com/njcn/user/controller/DeptController.java | 14 +++++++++++++- .../main/java/com/njcn/user/mapper/DeptMapper.java | 7 +++++++ .../com/njcn/user/mapper/mapping/DeptMapper.xml | 3 +++ .../java/com/njcn/user/service/IDeptService.java | 7 +++++++ .../njcn/user/service/impl/DeptServiceImpl.java | 11 ++++++++++- 7 files changed, 51 insertions(+), 2 deletions(-) diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java b/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java index cadb640e0..db65c8013 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java @@ -67,4 +67,10 @@ public interface DeptFeignClient { @GetMapping("/getDepSonIdtByDeptId") HttpResult> getDepSonIdtByDeptId(@RequestParam("deptId") String deptId); + /** + * 根据部门id获取子部门ids + */ + @GetMapping("/getDepSonIdByDeptId") + HttpResult> getDepSonIdByDeptId(@RequestParam("deptId") String deptId); + } diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java b/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java index 0ec22c16a..177343636 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java @@ -76,6 +76,11 @@ public class DeptFeignClientFallbackFactory implements FallbackFactory> getDepSonIdByDeptId(String deptId) { + log.error("{}异常，降级处理，异常为：{}","查询所有子孙部门异常",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java index 5a404a1f7..b5c320905 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java @@ -299,7 +299,19 @@ public class DeptController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptList, methodDescribe); } - + /** + * 根据部门id获取子部门ids + * @author dhj + * @date 2022/10/09 + */ + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @GetMapping("/getDepSonIdByDeptId") + @ApiOperation("根据部门id获取子部门ids") + public HttpResult> getDepSonIdByDeptId(@RequestParam("deptId")String deptId) { + String methodDescribe = getMethodDescribe("getDepSonIdByDeptId"); + List deptList = deptService.getDepSonIdByDeptId(deptId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptList, methodDescribe); + } } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/DeptMapper.java b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/DeptMapper.java index cd381eea1..6ffcae9a0 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/DeptMapper.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/DeptMapper.java @@ -102,4 +102,11 @@ public interface DeptMapper extends BaseMapper { * @date 2022/7/26 */ List getDeptSonIds(@Param("deptId") String deptId); + + /** + * 根据部门id获取子部门id集合 + * @author dhj + * @date 2022/10/09 + */ + List getDeptSonId(@Param("deptId") String deptId); } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml index ac860d4f0..69f2c61bf 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml @@ -164,5 +164,8 @@ select id from sys_dept where find_in_set(#{deptId},pids) and state = 1 + diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java index b8a15d23e..24450b761 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java @@ -155,4 +155,11 @@ public interface IDeptService extends IService { * @date 2022/7/13 */ List getDepSonIdtByDeptId(String id); + + /** + * 根据部门id获取子部门ids + * @author dhj + * @date 2022/7/13 + */ + List getDepSonIdByDeptId(String id); } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java index 86742e465..c809b4cd4 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java @@ -89,7 +89,7 @@ public class DeptServiceImpl extends ServiceImpl implements ID Dept dept = new Dept(); BeanUtil.copyProperties(deptParam, dept); //进行先解绑，再新增 - Integer httpResult=deptLineFeignClient.removeBind(deptParam.getPid()).getData(); + Integer httpResult = deptLineFeignClient.removeBind(deptParam.getPid()).getData(); System.out.println(httpResult); if (deptParam.getPid().equals("-1")) { //上层节点 @@ -318,4 +318,13 @@ public class DeptServiceImpl extends ServiceImpl implements ID public List getDepSonIdtByDeptId(String id) { return this.baseMapper.getDeptSonIds(id); } + + @Override + public List getDepSonIdByDeptId(String id) { + List sonId = this.baseMapper.getDeptSonId(id); + if (sonId.isEmpty()) { + sonId.add(id); + } + return sonId; + } }