From 7e3f51a44f9548d946dee6c8105c75066052ade9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Thu, 1 Dec 2022 09:43:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20=E6=96=B0=E5=A2=9E=E9=83=A8=E9=97=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AD=90=E9=83=A8=E9=97=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LogicDeviceLineServiceImpl.java | 3 ++- .../njcn/system/pojo/param/DictDataParam.java | 4 ++++ .../com/njcn/system/pojo/po/DictData.java | 2 ++ .../com/njcn/system/pojo/vo/DictDataVO.java | 5 +++++ .../com/njcn/user/api/DeptFeignClient.java | 6 ++++++ .../DeptFeignClientFallbackFactory.java | 6 ++++++ .../njcn/user/controller/DeptController.java | 21 ++++++++++++++++++- .../com/njcn/user/service/IDeptService.java | 10 +++++++++ .../user/service/impl/DeptServiceImpl.java | 8 +++++++ 9 files changed, 63 insertions(+), 2 deletions(-) diff --git a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java index b06afb64d..267a15da5 100644 --- a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java +++ b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java @@ -25,6 +25,7 @@ import com.njcn.energy.pojo.param.GroupArrParam; import com.njcn.energy.pojo.po.*; import com.njcn.energy.pojo.vo.*; import com.njcn.energy.service.*; +import com.njcn.influxdb.param.InfluxDBPublicParam; import com.njcn.influxdb.utils.InfluxDbUtils; import lombok.RequiredArgsConstructor; import org.influxdb.dto.QueryResult; @@ -416,7 +417,7 @@ public class LogicDeviceLineServiceImpl extends ServiceImpl> list = influxDbUtils.getResult(stringBuilderMax.toString(), ""); if (CollectionUtil.isNotEmpty(list)) { for(int i=0;i> getDepSonIdByDeptId(@RequestParam("deptId") String deptId); + /** + * 根据部门id获取直接子部门及自身 + */ + @GetMapping("/getDirectSonSelf") + HttpResult> getDirectSonSelf(@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 3c2b3b5eb..d37b6e18e 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 @@ -93,6 +93,12 @@ public class DeptFeignClientFallbackFactory implements FallbackFactory> getDirectSonSelf(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 f35956284..4aeee5c8b 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 @@ -291,7 +291,7 @@ public class DeptController extends BaseController { */ @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getDeptByCode") - @ApiOperation("根据部门Id获取部门信息") + @ApiOperation("根据部门code获取部门信息") public HttpResult getDeptByCode(@RequestParam("deptCode")String deptCode) { String methodDescribe = getMethodDescribe("getDeptByCode"); Dept result = deptService.getDeptByCode(deptCode); @@ -342,5 +342,24 @@ public class DeptController extends BaseController { } + /** + * 根据部门id获取直接子部门及自身 + * @param deptId 部门编号 + * @author cdf + * @date 2022/12/1 + */ + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @GetMapping("/getDirectSonSelf") + @ApiOperation("根据部门id获取直接子部门及自身") + public HttpResult> getDirectSonSelf(@RequestParam("deptId")String deptId){ + String methodDescribe = getMethodDescribe("getDirectSonSelf"); + List deptList = deptService.getDirectSonSelf(deptId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptList, methodDescribe); + + } + + + + } 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 2dc00df8d..be6512e8c 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 @@ -2,6 +2,7 @@ package com.njcn.user.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.common.pojo.response.HttpResult; import com.njcn.system.pojo.dto.AreaTreeDTO; import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.user.pojo.param.DeptParam; @@ -10,6 +11,7 @@ import com.njcn.user.pojo.vo.DeptAllTreeVO; import com.njcn.user.pojo.vo.DeptTreeVO; import com.njcn.user.pojo.vo.DeptVO; import com.njcn.user.pojo.vo.PvTerminalTreeVO; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -176,4 +178,12 @@ public interface IDeptService extends IService { * @date 2022/7/13 */ List getDepSonIdByDeptId(String id); + + /** + * 根据部门deptId获取直接子部门及自身 + * @param deptId 部门编号 + * @author cdf + * @date 2022/12/1 + */ + List getDirectSonSelf(String deptId); } 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 3b104a6bb..3fd0bdc3a 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 @@ -349,4 +349,12 @@ public class DeptServiceImpl extends ServiceImpl implements ID } return sonId; } + + @Override + public List getDirectSonSelf(String deptId) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(Dept::getPid,deptId).eq(Dept::getState, DataStateEnum.ENABLE.getCode()). + or().eq(Dept::getId,deptId); + return this.list(lambdaQueryWrapper); + } }