From dca3b36fb9ce39878d311909304db8c6d79654bf Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Mon, 22 Sep 2025 09:01:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E5=B1=9E=E3=80=81=E9=95=BF=E8=80=85?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=8A=A4=E7=90=86=E5=8D=95=E5=85=83=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/config/shiro/ShiroConfig.java | 4 +-- .../listener/DynamicQueueNameProvider.java | 14 ++++++++++ .../listener/ElderInfoMQListener.java | 22 ++++++++++++++- .../controller/NuBaseInfoController.java | 28 +++++++++++++++++++ 4 files changed, 65 insertions(+), 3 deletions(-) diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 9ffa5884..b8c9e848 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -85,8 +85,8 @@ public class ShiroConfig { // 配置不会被拦截的链接 顺序判断 //全部临时开放接口 { - filterChainDefinitionMap.put("/api/elderInfo/**", "anon");//新增长者 - filterChainDefinitionMap.put("/api/nuInfo/**", "anon");//绑定护理单元 +// filterChainDefinitionMap.put("/api/elderInfo/**", "anon");//新增长者 +// filterChainDefinitionMap.put("/api/nuInfo/**", "anon");//绑定护理单元 } filterChainDefinitionMap.put("/api/tplink/videoStorage/**", "anon"); //视频缓存存储接口 diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/mq/elderinfo/listener/DynamicQueueNameProvider.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/mq/elderinfo/listener/DynamicQueueNameProvider.java index 5d324e26..f52b5d0a 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/mq/elderinfo/listener/DynamicQueueNameProvider.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/mq/elderinfo/listener/DynamicQueueNameProvider.java @@ -40,4 +40,18 @@ public class DynamicQueueNameProvider { return getUpdateElderInfoQueueName(); } + public String getUpdateGuardianInfoQueueName() { + JSONObject deptInfo = sysBaseAPI.getDeptInfo(); + String orgCode = deptInfo.getString("code"); + if (StringUtils.isNotBlank(orgCode)) { + return orgCode + ".elder.updateguardianinfo"; + } else { + return ""; + } + } + + public String getUpdateGuardianInfoKeyName() { + return getUpdateGuardianInfoQueueName(); + } + } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/mq/elderinfo/listener/ElderInfoMQListener.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/mq/elderinfo/listener/ElderInfoMQListener.java index bdafe72e..e25ea88f 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/mq/elderinfo/listener/ElderInfoMQListener.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/mq/elderinfo/listener/ElderInfoMQListener.java @@ -1,6 +1,7 @@ package com.nu.modules.mq.elderinfo.listener; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.nu.dto.ElderInfoMQDto; import com.nu.modules.elderinfo.entity.ElderInfo; import com.nu.modules.elderinfo.service.IElderInfoService; @@ -54,7 +55,6 @@ public class ElderInfoMQListener { new Thread(() -> { //去管理平台拉取资源 { - JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "ope_open_url"); String baseUrl = opeOpenUrl.getString("configValue"); if (baseUrl.endsWith("/")) { @@ -191,4 +191,24 @@ public class ElderInfoMQListener { } } } + + /** + * 修改长者的联系人信息 + * + * @param dto + */ + @RabbitListener(bindings = @QueueBinding(value = @Queue(name = "#{elderInfoAsyncDQNP.getUpdateGuardianInfoQueueName()}"), exchange = @Exchange(name = "hldy.elder", type = ExchangeTypes.DIRECT), key = "#{elderInfoAsyncDQNP.getUpdateGuardianInfoKeyName()}"), errorHandler = "elderInfoMQErrorHandler") + @Transactional(rollbackFor = {Exception.class}) + public void handleUpdateGuardianInfo(ElderInfoMQDto dto) { + UpdateWrapper uw = new UpdateWrapper<>(); + uw.eq("guardian_open_id",dto.getGuardianOpenId()); + + ElderInfo elderInfo = new ElderInfo(); + elderInfo.setGuardianName(dto.getGuardianName());//联系人姓名 + elderInfo.setGuardianPhone(dto.getGuardianPhone());//联系人电话 + elderInfo.setGuardianIdCard(dto.getGuardianIdCard());//联系人身份证号 + elderInfo.setGuardianHomeAddress(dto.getGuardianHomeAddress());//联系人家庭住址 + elderInfo.setGuardianWorkUnit(dto.getGuardianWorkUnit());//联系人工作单位 + elderInfoService.update(elderInfo,uw); + } } diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java index 22b3f406..2eb37665 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java @@ -80,6 +80,34 @@ public class NuBaseInfoController extends JeecgController> queryNuOccupancyInfoList(NuBaseInfo nuBaseInfo, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Map customeRuleMap = new HashMap<>(); + customeRuleMap.put("nu_name", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("nu_id", QueryRuleEnum.LIKE_WITH_OR); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuBaseInfo, req.getParameterMap(), customeRuleMap); + queryWrapper.eq("area_flag","1"); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuBaseInfoService.page(page, queryWrapper); + //TODO 把长者信息加进来 + + return Result.OK(pageList); + } + /** * 添加 *