家属、长者绑定护理单元流程

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/elderInfo/**", "anon");//新增长者
-            filterChainDefinitionMap.put("/api/nuInfo/**", "anon");//绑定护理单元
+//            filterChainDefinitionMap.put("/api/nuInfo/**", "anon");//绑定护理单元
 
         }
         filterChainDefinitionMap.put("/api/tplink/videoStorage/**", "anon"); //视频缓存存储接口

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();
+    }
+
 }

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<ElderInfo> 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);
+    }
 }

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<NuBaseInfo, INuBaseInf
         return Result.OK(pageList);
     }
 
+    /**
+     * 护理单元-入住信息分页列表查询
+     *
+     * @param nuBaseInfo
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "护理单元-分页列表查询")
+    @ApiOperation(value = "护理单元-入住信息分页列表查询", notes = "护理单元-入住信息分页列表查询")
+    @GetMapping(value = "/queryNuOccupancyInfoList")
+    public Result<IPage<NuBaseInfo>> queryNuOccupancyInfoList(NuBaseInfo nuBaseInfo,
+                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                   HttpServletRequest req) {
+        Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
+        customeRuleMap.put("nu_name", QueryRuleEnum.LIKE_WITH_OR);
+        customeRuleMap.put("nu_id", QueryRuleEnum.LIKE_WITH_OR);
+        QueryWrapper<NuBaseInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuBaseInfo, req.getParameterMap(), customeRuleMap);
+        queryWrapper.eq("area_flag","1");
+        Page<NuBaseInfo> page = new Page<NuBaseInfo>(pageNo, pageSize);
+        IPage<NuBaseInfo> pageList = nuBaseInfoService.page(page, queryWrapper);
+        //TODO 把长者信息加进来
+
+        return Result.OK(pageList);
+    }
+
     /**
      * 添加
      *