From a9f0b494b02635620c636ba6db16a8c2ab5054c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Mon, 28 Nov 2022 10:14:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=9A=E8=BF=87=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E7=BC=96=E5=8F=B7=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/system/enums/SystemResponseEnum.java | 2 +- .../system/pojo/constant/DicDataConstant.java | 16 ++++++++++++++++ .../java/com/njcn/user/api/DeptFeignClient.java | 8 ++++++++ .../fallback/DeptFeignClientFallbackFactory.java | 6 ++++++ .../com/njcn/user/controller/DeptController.java | 14 ++++++++++++++ .../java/com/njcn/user/mapper/DeptMapper.java | 7 +++++++ .../com/njcn/user/mapper/mapping/DeptMapper.xml | 6 ++++++ .../java/com/njcn/user/service/IDeptService.java | 7 +++++++ .../njcn/user/service/impl/DeptServiceImpl.java | 16 +++++++++++++++- 9 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 pqs-system/system-api/src/main/java/com/njcn/system/pojo/constant/DicDataConstant.java diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java index 4659b7a1e..ccc5ebb93 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java @@ -37,7 +37,7 @@ public enum SystemResponseEnum { MONITOR_TAG_EMPTY("A00365","查询字典监测点标签类型为空"), MONITORY_TYPE_EMPTY("A00366","查询字典监测对象类型为空"), TERMINAL_WIRING_EMPTY("A00367","查询字典监测终端接线方式为空"), - + MONITOR_TYPE_EMPTY("A00368","查询字典监测点类别为空"), diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/constant/DicDataConstant.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/constant/DicDataConstant.java new file mode 100644 index 000000000..f75538836 --- /dev/null +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/constant/DicDataConstant.java @@ -0,0 +1,16 @@ +package com.njcn.system.pojo.constant; + +/** + * pqs + * + * @author cdf + * @date 2022/11/23 + */ +public interface DicDataConstant { + + /*监测点类别*/ + String ONE_LINE = "One_Line"; + String TWO_LINE = "Two_Line"; + String THREE_LINE ="Three_Line"; + +} 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 b4743c7c3..ed97113aa 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 @@ -72,6 +72,14 @@ public interface DeptFeignClient { @GetMapping("/getDepSonIdtByDeptId") HttpResult> getDepSonIdtByDeptId(@RequestParam("deptId") String deptId); + /** + * 根据部门id获取所有子部门ids + */ + @GetMapping("/getDepSonSelfCodetByDeptId") + HttpResult> getDepSonSelfCodetByDeptId(@RequestParam("deptId") String deptId); + + + /** * 根据部门id获取子部门ids */ 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 79ae8efda..3c2b3b5eb 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 @@ -82,6 +82,12 @@ public class DeptFeignClientFallbackFactory implements FallbackFactory> getDepSonSelfCodetByDeptId(String deptId) { + log.error("{}异常，降级处理，异常为：{}","查询所有子孙部门异常",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + @Override public HttpResult> getDepSonIdByDeptId(String deptId) { log.error("{}异常，降级处理，异常为：{}","查询所有子孙部门异常",cause.toString()); 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 af685393d..729bb5b39 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 @@ -313,6 +313,20 @@ public class DeptController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptList, methodDescribe); } + /** + * 根据部门id获取所有子部门的code + * @author cdf + * @date 2022/11/25 + */ + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @GetMapping("/getDepSonSelfCodetByDeptId") + @ApiOperation("根据部门id获取所有子部门以及自身的code") + public HttpResult> getDepSonSelfCodetByDeptId(@RequestParam("deptId")String deptId) { + String methodDescribe = getMethodDescribe("getDepSonSelfIdtByDeptId"); + List deptList = deptService.getDepSonSelfCodetByDeptId(deptId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptList, methodDescribe); + } + /** * 根据部门id获取子部门ids * @author dhj 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 6ffcae9a0..04a8d34cf 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 @@ -103,6 +103,13 @@ public interface DeptMapper extends BaseMapper { */ List getDeptSonIds(@Param("deptId") String deptId); + /** + * 根据部门id获取所有子部门以及自己code集合 + * @author cdf + * @date 2022/7/26 + */ + List getDeptSonSlfeIds(@Param("deptId") String deptId); + /** * 根据部门id获取子部门id集合 * @author dhj 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 6ab632977..af51533f6 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 @@ -166,6 +166,12 @@ 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 4257189dc..2dc00df8d 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 @@ -163,6 +163,13 @@ public interface IDeptService extends IService { */ List getDepSonIdtByDeptId(String id); + /** + * 根据部门id获取部门详情 + * @author cdf + * @date 2022/7/13 + */ + List getDepSonSelfCodetByDeptId(String id); + /** * 根据部门id获取子部门ids * @author dhj 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 8d8206ac6..c815504df 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 @@ -1,6 +1,7 @@ package com.njcn.user.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -324,7 +325,20 @@ public class DeptServiceImpl extends ServiceImpl implements ID */ @Override public List getDepSonIdtByDeptId(String id) { - return this.baseMapper.getDeptSonIds(id); + List sonIds = this.baseMapper.getDeptSonIds(id); + if(CollectionUtil.isNotEmpty(sonIds)){ + sonIds.add(id); + } + return sonIds; + } + + @Override + public List getDepSonSelfCodetByDeptId(String id) { + List sonIds = this.baseMapper.getDeptSonSlfeIds(id); + if(CollectionUtil.isNotEmpty(sonIds)){ + sonIds.add(id); + } + return sonIds; } @Override