From de001cc030da9c4b8660d72c024e9b8de1b8567c Mon Sep 17 00:00:00 2001 From: liyj <15602261488@163.com> Date: Mon, 28 Oct 2024 22:00:59 +0800 Subject: [PATCH] 1、镇街直属部门组织人员登录单位显示 --- dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java | 56 +++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 39 insertions(+), 17 deletions(-) diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java index 5691399..a68fc5d 100644 --- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java +++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java @@ -9,7 +9,6 @@ import cn.huge.module.ctuser.service.CtUnitService; import cn.huge.module.ctuser.service.CtUserService; import cn.huge.module.cust.dto.CtUnitDTO; -import cn.huge.module.cust.dto.CtUserDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -40,22 +39,6 @@ private CtUserService ctUserService; /** - * 微服务调用-数据迁移-批量新增 - * @url {ctx}/api/client/ctUnit/saveCtUnitList - * @param targetCtUnitList 实体对象 - * @return Object - */ - @PostMapping("/saveCtUnitList") - public Object saveCtUnitList(@RequestBody List<CtUnit> targetCtUnitList) { - try { - service.saveBatch(targetCtUnitList,1000); - return ReturnSucUtils.getRepInfo(); - } catch (Exception e) { - return ReturnFailUtils.getRepInfo(); - } - } - - /** * 根据id查询组织信息 * @url {ctx}/api/client/ctUnit/getUnitById * @param unitId 组织编号 @@ -73,6 +56,7 @@ return ReturnFailUtils.getRepInfo("查询组织不存在!"); } } catch (Exception e) { + log.error("Controller接口[CtUnitClientController.getUnitById]请求异常:"+e, e); return ReturnFailUtils.getRepInfo(); } } @@ -91,4 +75,42 @@ return ReturnFailUtils.getRepInfo(e.getMessage()); } } + + /** + * 获取本级综治中心 + * @url {ctx}/api/client/ctUnit/getBjZzzx + * @param unitId 组织编号 + * @return Object + */ + @GetMapping("/getBjZzzx") + public Object getBjZzzx(@RequestParam(value = "unitId") String unitId) { + try { + return ReturnSucUtils.getRepInfo(service.getBjZzzx(unitId)); + } catch (Exception e) { + return ReturnFailUtils.getRepInfo(e.getMessage()); + } + } + + /** + * 查询用户所在的单位信息 + * @url {ctx}/api/client/ctUnit/getUnitByUserId + * @param userId 用户编号 + * @return Object + */ + @GetMapping("/getUnitByUserId") + public Object getUnitByUserId(@RequestParam(value = "userId") String userId) { + try { + CtUser ctUser = ctUserService.getById(userId); + CtUnit ctUnit = service.getById(ctUser.getUnitId()); + if (ObjectUtils.isNotEmpty(ctUnit)){ + CtUnitDTO ctUnitDTO = new CtUnitDTO(); + BeanUtils.copyProperties(ctUnit, ctUnitDTO); + return ReturnSucUtils.getRepInfo(ctUnitDTO); + }else { + return ReturnFailUtils.getRepInfo("查询组织不存在!"); + } + } catch (Exception e) { + return ReturnFailUtils.getRepInfo(); + } + } } -- Gitblit v1.8.0