From 21f45258cfcdc79127f85ad6e45736cff5acd345 Mon Sep 17 00:00:00 2001 From: liyj <15602261488@163.com> Date: Mon, 21 Oct 2024 20:58:05 +0800 Subject: [PATCH] 1、数据割接程序,白云区矛盾纠纷多元化解平台 2、纠纷态势报错修改 --- dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java | 78 +++++++++++++++++++++++++++++++++++--- 1 files changed, 71 insertions(+), 7 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 35e90ca..d6df878 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 @@ -1,11 +1,16 @@ package cn.huge.module.ctuser.controller.client; +import cn.huge.base.common.utils.ObjectUtils; import cn.huge.base.common.utils.ReturnFailUtils; import cn.huge.base.common.utils.ReturnSucUtils; +import cn.huge.base.config.CurrentUser; import cn.huge.module.ctuser.domain.po.CtUnit; +import cn.huge.module.ctuser.domain.po.CtUser; import cn.huge.module.ctuser.service.CtUnitService; import cn.huge.module.ctuser.service.CtUserService; +import cn.huge.module.cust.dto.CtUnitDTO; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -34,16 +39,75 @@ private CtUserService ctUserService; /** - * 微服务调用-数据迁移-批量新增 - * @url {ctx}/api/client/ctUnit/saveCtUnitList - * @param targetCtUnitList 实体对象 + * 根据id查询组织信息 + * @url {ctx}/api/client/ctUnit/getUnitById + * @param unitId 组织编号 * @return Object */ - @PostMapping("/saveCtUnitList") - public Object saveCtUnitList(@RequestBody List<CtUnit> targetCtUnitList) { + @GetMapping("/getUnitById") + public Object getUnitById(@RequestParam(value = "unitId") String unitId) { try { - service.saveBatch(targetCtUnitList); - return ReturnSucUtils.getRepInfo(); + CtUnit ctUnit = service.getById(unitId); + 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(); + } + } + + /** + * 获取上级综治中心 + * @url {ctx}/api/client/ctUnit/getParentZzzxUnit + * @param unitId 组织编号 + * @return Object + */ + @GetMapping("/getParentZzzxUnit") + public Object getParentZzzxUnit(@RequestParam(value = "unitId") String unitId) { + try { + return ReturnSucUtils.getRepInfo(service.getParentZzzx(unitId)); + } catch (Exception e) { + 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