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 db65c8013..b4743c7c3 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 @@ -60,6 +60,11 @@ public interface DeptFeignClient { @GetMapping("/getDeptById") HttpResult getDeptById(@RequestParam("deptId") String deptId); + /** + * 根据部门code获取部门信息 + */ + @GetMapping("/getDeptByCode") + HttpResult getDeptByCode(@RequestParam("deptCode") String deptCode); /** * 根据部门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 177343636..79ae8efda 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 @@ -70,6 +70,12 @@ public class DeptFeignClientFallbackFactory implements FallbackFactory getDeptByCode(String deptCode) { + log.error("{}异常,降级处理,异常为:{}","查询部门信息异常",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + @Override public HttpResult> getDepSonIdtByDeptId(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 b5c320905..af685393d 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 @@ -271,7 +271,7 @@ public class DeptController extends BaseController { } /** - * 根据部门获取部门信息 + * 根据部门Id获取部门信息 * @author cdf * @date 2022/7/12 */ @@ -284,6 +284,20 @@ public class DeptController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + /** + * 根据部门code获取部门信息 + * @author cdf + * @date 2022/7/12 + */ + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @GetMapping("/getDeptByCode") + @ApiOperation("根据部门Id获取部门信息") + public HttpResult getDeptByCode(@RequestParam("deptCode")String deptCode) { + String methodDescribe = getMethodDescribe("getDeptByCode"); + Dept result = deptService.getDeptByCode(deptCode); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + /** * 根据部门id获取所有子部门ids 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 24450b761..4257189dc 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 @@ -148,6 +148,13 @@ public interface IDeptService extends IService { */ Dept getDeptById(String id); + /** + * 根据部门code获取部门详情 + * @author cdf + * @date 2022/7/13 + */ + Dept getDeptByCode(String deptCode); + /** * 根据部门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 223bc82ff..8d8206ac6 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 @@ -266,6 +266,13 @@ public class DeptServiceImpl extends ServiceImpl implements ID return this.baseMapper.selectById(id); } + @Override + public Dept getDeptByCode(String deptCode) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(Dept::getCode,deptCode).eq(Dept::getState,DataStateEnum.ENABLE.getCode()); + return this.baseMapper.selectOne(lambdaQueryWrapper); + } + /** * 校验参数,检查是否存在相同编码的部门