yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
曹磊 2025-09-30 16:23:10 +08:00
parent e094a3321d e89935a148
commit b98901dd35
6 changed files with 161 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java
View File

@ -3,7 +3,6 @@ package com.nu.modules.wechat.elder.api;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.nu.dto.ElderInfoMQDto; import com.nu.dto.ElderInfoMQDto;
import com.nu.entity.ElderInfoEntity; import com.nu.entity.ElderInfoEntity;
@ -297,6 +296,12 @@ public class ElderApi {
BeanUtils.copyProperties(elderInfoEntity, mqdto); BeanUtils.copyProperties(elderInfoEntity, mqdto);
mqdto.setId(id); mqdto.setId(id);
rabbitMQUtil.sendToExchange("hldy.elder", elderInfoEntity.getOrgCode() + ".elder.addelder", mqdto); rabbitMQUtil.sendToExchange("hldy.elder", elderInfoEntity.getOrgCode() + ".elder.addelder", mqdto);
//处理管理端老人信息
ElderInfoEntity elderInfoEn = new ElderInfoEntity();
BeanUtils.copyProperties(mqdto,elderInfoEn);
elderInfoApi.addElder(elderInfoEn);
return Result.ok(id); return Result.ok(id);
} }

38
nursing-unit-api/src/main/java/com/nu/modules/wechat/nubaseinfo/api/NuBaseInfoApi.java
View File

@ -69,24 +69,24 @@ public class NuBaseInfoApi {
* @return * @return
*/ */
@GetMapping("/queryBillList") @GetMapping("/queryBillList")
public Result<List<NuBillEntity>> queryBillList(@RequestParam("openId") String openId) { public Result<List<NuBillEntity>> queryBillList(@RequestParam("openId") String openId, @RequestParam("orgCode") String orgCode) {
//护理单元信息 //护理单元信息
List<NuBaseElderEntity> nuElderList = nuBaseElderApi.queryByOpenId(openId, null); // List<NuBaseElderEntity> nuElderList = nuBaseElderApi.queryByOpenId(openId, null);
if (nuElderList == null || nuElderList.size() == 0) { // if (nuElderList == null || nuElderList.size() == 0) {
return Result.ok(List.of()); // return Result.ok(List.of());
} // }
//
//key:orgCode value:nuid逗号拼接的字符串 // //key:orgCode value:nuid逗号拼接的字符串
Map<String, String> orgCodeToNuIdMap = nuElderList.stream() // Map<String, String> orgCodeToNuIdMap = nuElderList.stream()
.filter(entity -> entity.getOrgCode() != null && entity.getNuId() != null) // .filter(entity -> entity.getOrgCode() != null && entity.getNuId() != null)
.collect(Collectors.groupingBy( // .collect(Collectors.groupingBy(
NuBaseElderEntity::getOrgCode, // NuBaseElderEntity::getOrgCode,
Collectors.mapping(NuBaseElderEntity::getNuId, Collectors.joining(",")) // Collectors.mapping(NuBaseElderEntity::getNuId, Collectors.joining(","))
)); // ));
List<NuBillEntity> result = Lists.newArrayList(); List<NuBillEntity> result = Lists.newArrayList();
for (Map.Entry<String, String> entry : orgCodeToNuIdMap.entrySet()) { // for (Map.Entry<String, String> entry : orgCodeToNuIdMap.entrySet()) {
String orgCode = entry.getKey(); // String orgCode = entry.getKey();
// String nuIds = entry.getValue(); // String nuIds = entry.getValue();
//切换数据源整理好数据放到返回结果中 //切换数据源整理好数据放到返回结果中
@ -94,12 +94,12 @@ public class NuBaseInfoApi {
NuBillEntity params = new NuBillEntity(); NuBillEntity params = new NuBillEntity();
params.setOpenId(openId); params.setOpenId(openId);
List<NuBillEntity> list = nuBillApi.queryByOpenId(params); List<NuBillEntity> list = nuBillApi.queryByOpenId(params);
if (list == null || list.size() == 0) { // if (list == null || list.size() == 0) {
continue; // continue;
} // }
DynamicDataSourceContextHolder.clear(); DynamicDataSourceContextHolder.clear();
result.addAll(list); result.addAll(list);
} // }
List<NuBillEntity> sortedResult = result.stream() List<NuBillEntity> sortedResult = result.stream()
.sorted(Comparator.comparing(NuBillEntity::getCreateTime, Comparator.nullsLast(Date::compareTo)).reversed()) .sorted(Comparator.comparing(NuBillEntity::getCreateTime, Comparator.nullsLast(Date::compareTo)).reversed())

4
nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java
View File

@ -247,4 +247,8 @@ public class ElderInfoMQDto implements Serializable {
//需要变更谁的信息 zz长者 jhr监护人 //需要变更谁的信息 zz长者 jhr监护人
private String modifyType; private String modifyType;
//变更审批结果
private String upAuditResut;
} }

2
nursing-unit-elder/nu-elder-api/nu-elder-local-api/src/main/java/com/nu/modules/elder/api/IElderInfoApi.java
View File

@ -9,4 +9,6 @@ public interface IElderInfoApi {
List<ElderInfoEntity> queryByElderIds(String[] split); List<ElderInfoEntity> queryByElderIds(String[] split);
List<ElderInfoEntity> queryElders(String openId, String elderId); List<ElderInfoEntity> queryElders(String openId, String elderId);
void addElder(ElderInfoEntity elderInfoEn);
} }

18
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.nu.modules.elderinfo.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.dto.ElderInfoMQDto;
import com.nu.entity.ElderInfoEntity; import com.nu.entity.ElderInfoEntity;
import com.nu.modules.baseinfo.api.INuBaseInfoApi; import com.nu.modules.baseinfo.api.INuBaseInfoApi;
import com.nu.modules.elder.api.IElderInfoApi; import com.nu.modules.elder.api.IElderInfoApi;
@ -10,6 +11,7 @@ import com.nu.modules.elderinfo.entity.ElderInfo;
import com.nu.modules.elderinfo.mapper.ElderInfoMapper; import com.nu.modules.elderinfo.mapper.ElderInfoMapper;
import com.nu.modules.elderinfo.service.IElderInfoService; import com.nu.modules.elderinfo.service.IElderInfoService;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -44,4 +46,20 @@ public class ElderInfoServiceImpl extends ServiceImpl<ElderInfoMapper, ElderInfo
List<ElderInfo> elderInfos = baseMapper.selectList(qw); List<ElderInfo> elderInfos = baseMapper.selectList(qw);
return BeanUtil.copyToList(elderInfos, ElderInfoEntity.class); return BeanUtil.copyToList(elderInfos, ElderInfoEntity.class);
} }
@Override
public void addElder(ElderInfoEntity dto) {
ElderInfo elderInfo = new ElderInfo();
BeanUtils.copyProperties(dto, elderInfo);
ElderInfo oldElderInfo = baseMapper.selectById(dto.getId());
if (oldElderInfo != null) {
//长者之前入住过
baseMapper.updateById(elderInfo);
} else {
//长者第一次入住机构
elderInfo.setDelFlag("0");
baseMapper.insert(elderInfo);
}
}
} }

106
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/mq/eldertag/listener/ElderTaggMQListener.java
View File

@ -1,19 +1,27 @@
package com.nu.mq.eldertag.listener; package com.nu.mq.eldertag.listener;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Maps;
import com.nu.dto.ElderInfoMQDto;
import com.nu.dto.ElderTagAsyncMQDto; import com.nu.dto.ElderTagAsyncMQDto;
import com.nu.dto.ElderTagTypeMQDto; import com.nu.dto.ElderTagTypeMQDto;
import com.nu.dto.StatusMQDto; import com.nu.dto.StatusMQDto;
import com.nu.entity.WxNoticeEntity;
import com.nu.enums.MQStatus; import com.nu.enums.MQStatus;
import com.nu.enums.WxClientType;
import com.nu.modules.async.entity.AsyncStatus; import com.nu.modules.async.entity.AsyncStatus;
import com.nu.modules.async.service.IAsyncMainService; import com.nu.modules.async.service.IAsyncMainService;
import com.nu.modules.async.service.IAsyncStatusService; import com.nu.modules.async.service.IAsyncStatusService;
import com.nu.modules.canaddeldertag.entity.CanAddElderTag; import com.nu.modules.canaddeldertag.entity.CanAddElderTag;
import com.nu.modules.canaddeldertag.service.ICanAddElderTagService; import com.nu.modules.canaddeldertag.service.ICanAddElderTagService;
import com.nu.modules.elderinfo.entity.ElderInfo;
import com.nu.modules.elderinfo.service.IElderInfoService;
import com.nu.modules.eldertagtypere.entity.ElderTagTypeRe; import com.nu.modules.eldertagtypere.entity.ElderTagTypeRe;
import com.nu.modules.eldertagtypere.service.IElderTagTypeReService; import com.nu.modules.eldertagtypere.service.IElderTagTypeReService;
import com.nu.modules.wxnotice.IWxNoticeApi;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.ExchangeTypes; import org.springframework.amqp.core.ExchangeTypes;
import org.springframework.amqp.rabbit.annotation.Exchange; import org.springframework.amqp.rabbit.annotation.Exchange;
@ -25,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.Date; import java.util.Date;
import java.util.Map;
@Slf4j @Slf4j
@Component @Component
@ -38,6 +47,10 @@ public class ElderTaggMQListener {
private ICanAddElderTagService canAddElderTagService; private ICanAddElderTagService canAddElderTagService;
@Autowired @Autowired
private IElderTagTypeReService elderTagTypeService; private IElderTagTypeReService elderTagTypeService;
@Autowired
private IElderInfoService elderInfoService;
@Autowired
private IWxNoticeApi wxNoticeApi;
/** /**
* 其他平台新增指令 * 其他平台新增指令
@ -72,7 +85,7 @@ public class ElderTaggMQListener {
} }
ElderTagTypeRe elderTagType = new ElderTagTypeRe(); ElderTagTypeRe elderTagType = new ElderTagTypeRe();
BeanUtils.copyProperties(dto,elderTagType); BeanUtils.copyProperties(dto, elderTagType);
elderTagType.setId(IdUtil.simpleUUID()); elderTagType.setId(IdUtil.simpleUUID());
elderTagType.setTypeId(dto.getId()); elderTagType.setTypeId(dto.getId());
elderTagTypeService.save(elderTagType); elderTagTypeService.save(elderTagType);
@ -92,4 +105,95 @@ public class ElderTaggMQListener {
asyncStatus.setMsg(dto.getMessage()); asyncStatus.setMsg(dto.getMessage());
asyncStatusService.updateById(asyncStatus); asyncStatusService.updateById(asyncStatus);
} }
@RabbitListener(bindings = @QueueBinding(value = @Queue(name = "hldy.elder.infoUp.result"), exchange = @Exchange(name = "hldy.elder", type = ExchangeTypes.DIRECT), key = "hldy.elder.infoUp.result"), errorHandler = "elderTaggMQErrorHandler")
public void handleInfoUp(ElderInfoMQDto dto) {
if ("Y".equals(dto.getUpAuditResut())) {
ElderInfo elderInfo = new ElderInfo();
BeanUtils.copyProperties(dto, elderInfo);
elderInfoService.updateById(elderInfo);
if ("jhr".equals(dto.getModifyType())) {
//增加消息通知
WxNoticeEntity wxNoticeEntity = new WxNoticeEntity();
wxNoticeEntity.setOpenId(dto.getGuardianOpenId());
wxNoticeEntity.setIzRead("1");
wxNoticeEntity.setOrgCode(dto.getOrgCode());
wxNoticeEntity.setTitle("监护人信息变更审批");
wxNoticeEntity.setContent("您好，您提交的" + dto.getName() + "老人的家属信息变更申请已通过");
wxNoticeEntity.setType("elder_jhr_info_update_list");
Map<String, Object> extend = Maps.newHashMap();
extend.put("orgCode", dto.getOrgCode());
extend.put("dataId", dto.getId());
wxNoticeEntity.setExtend(JSONObject.toJSONString(extend));
wxNoticeEntity.setClientType(WxClientType.EMPLOYEE.getCode());
wxNoticeApi.addNotice(wxNoticeEntity);
wxNoticeApi.sendWechartMinMessage(wxNoticeEntity);
}
if ("zz".equals(dto.getModifyType())) {
//增加消息通知
WxNoticeEntity wxNoticeEntity = new WxNoticeEntity();
wxNoticeEntity.setOpenId(dto.getGuardianOpenId());
wxNoticeEntity.setIzRead("1");
wxNoticeEntity.setOrgCode(dto.getOrgCode());
wxNoticeEntity.setTitle("长者信息变更审批");
wxNoticeEntity.setContent("您好，您提交的" + dto.getName() + "老人信息变更申请已通过");
wxNoticeEntity.setType("elder_info_update_list");
Map<String, Object> extend = Maps.newHashMap();
extend.put("orgCode", dto.getOrgCode());
extend.put("dataId", dto.getId());
wxNoticeEntity.setExtend(JSONObject.toJSONString(extend));
wxNoticeEntity.setClientType(WxClientType.EMPLOYEE.getCode());
wxNoticeApi.addNotice(wxNoticeEntity);
wxNoticeApi.sendWechartMinMessage(wxNoticeEntity);
}
}
if ("N".equals(dto.getUpAuditResut())) {
if ("jhr".equals(dto.getModifyType())) {
ElderInfo elderInfo = new ElderInfo();
elderInfo.setId(dto.getId());
elderInfo.setGuardianModifyStatus("3");//监护人审批结果
elderInfo.setGuardianModifyContent(dto.getGuardianModifyContent());//监护人审批不通过原因
elderInfoService.updateById(elderInfo);
//增加消息通知
WxNoticeEntity wxNoticeEntity = new WxNoticeEntity();
wxNoticeEntity.setOpenId(dto.getGuardianOpenId());
wxNoticeEntity.setIzRead("1");
wxNoticeEntity.setOrgCode(dto.getOrgCode());
wxNoticeEntity.setTitle("监护人信息变更审批");
wxNoticeEntity.setContent("您好，您提交的" + dto.getName() + "老人的家属信息变更申请未通过");
wxNoticeEntity.setType("elder_jhr_info_update_list");
Map<String, Object> extend = Maps.newHashMap();
extend.put("orgCode", dto.getOrgCode());
extend.put("dataId", dto.getId());
wxNoticeEntity.setExtend(JSONObject.toJSONString(extend));
wxNoticeEntity.setClientType(WxClientType.EMPLOYEE.getCode());
wxNoticeApi.addNotice(wxNoticeEntity);
wxNoticeApi.sendWechartMinMessage(wxNoticeEntity);
}
if ("zz".equals(dto.getModifyType())) {
ElderInfo elderInfo = new ElderInfo();
elderInfo.setId(dto.getId());
elderInfo.setElderModifyStatus("3");//长者审批结果
elderInfo.setElderModifyContent(dto.getElderModifyContent());//长者审批不通过原因
elderInfoService.updateById(elderInfo);
//增加消息通知
WxNoticeEntity wxNoticeEntity = new WxNoticeEntity();
wxNoticeEntity.setOpenId(dto.getGuardianOpenId());
wxNoticeEntity.setIzRead("1");
wxNoticeEntity.setOrgCode(dto.getOrgCode());
wxNoticeEntity.setTitle("长者信息变更审批");
wxNoticeEntity.setContent("您好，您提交的" + dto.getName() + "老人信息变更申请未通过");
wxNoticeEntity.setType("elder_info_update_list");
Map<String, Object> extend = Maps.newHashMap();
extend.put("orgCode", dto.getOrgCode());
extend.put("dataId", dto.getId());
wxNoticeEntity.setExtend(JSONObject.toJSONString(extend));
wxNoticeEntity.setClientType(WxClientType.EMPLOYEE.getCode());
wxNoticeApi.addNotice(wxNoticeEntity);
wxNoticeApi.sendWechartMinMessage(wxNoticeEntity);
}
}
}
} }