From 38cc258e998ee00559182ad2204f3e72bbaf9203 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 25 Feb 2026 14:54:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E8=80=85=E6=A0=87=E7=AD=BE=E6=94=B9?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nu/dto/ElderTagOpeLogInfoMQDto.java | 43 ++++++++++++++++ .../com/nu/dto/ElderTagOpeLogMainMQDto.java | 44 ++++++++++++++++ .../com/nu/dto/ElderTagSyncLogInfoMQDto.java | 51 +++++++++++++++++++ .../com/nu/dto/ElderTagSyncLogMainMQDto.java | 33 ++++++++++++ .../listener/ElderTaggMQListener.java | 43 ++++++++++++++-- 5 files changed, 210 insertions(+), 4 deletions(-) create mode 100644 nursing-unit-common/src/main/java/com/nu/dto/ElderTagOpeLogInfoMQDto.java create mode 100644 nursing-unit-common/src/main/java/com/nu/dto/ElderTagOpeLogMainMQDto.java create mode 100644 nursing-unit-common/src/main/java/com/nu/dto/ElderTagSyncLogInfoMQDto.java create mode 100644 nursing-unit-common/src/main/java/com/nu/dto/ElderTagSyncLogMainMQDto.java diff --git a/nursing-unit-common/src/main/java/com/nu/dto/ElderTagOpeLogInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/ElderTagOpeLogInfoMQDto.java new file mode 100644 index 0000000..31bfc91 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/ElderTagOpeLogInfoMQDto.java @@ -0,0 +1,43 @@ +package com.nu.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Description: 长者标签-操作日志-详情表 + * @Author: jeecg-boot + * @Date: 2026-02-25 + * @Version: V1.0 + */ +@Data +public class ElderTagOpeLogInfoMQDto implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**nu_config_elder_tag_ope_log_main.id*/ + private String pkId; + /**创建日期*/ + private Date createTime; + /**数据类型 1修改前 2修改后*/ + private String dataType; + /**标签类型nu_elder_tag_type.id*/ + private String type; + /**标签类型中文名*/ + private String typeName; + /**标签名称*/ + private String tagName; + /**说明*/ + private String describ; + /**价格*/ + private BigDecimal price; + /**默认图标*/ + private String pic; + /**焦点图标*/ + private String picFocus; + /**所属机构*/ + private String sysOrgCode; +} diff --git a/nursing-unit-common/src/main/java/com/nu/dto/ElderTagOpeLogMainMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/ElderTagOpeLogMainMQDto.java new file mode 100644 index 0000000..ae04cda --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/ElderTagOpeLogMainMQDto.java @@ -0,0 +1,44 @@ +package com.nu.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * @Description: 长者标签-操作日志-主表 + * @Author: jeecg-boot + * @Date: 2026-02-25 + * @Version: V1.0 + */ +@Data +public class ElderTagOpeLogMainMQDto implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**操作类型 1新增 2修改*/ + private String opeType; + /**机构编码*/ + private String orgCode; + /**操作人*/ + private String createBy; + /**操作日期*/ + private Date createTime; + /**标签类型中文名*/ + private String typeName; + /**标签名称*/ + private String tagName; + /**说明*/ + private String describ; + /**价格*/ + private BigDecimal price; + /**默认图标*/ + private String pic; + /**焦点图标*/ + private String picFocus; + + private List infoList; +} diff --git a/nursing-unit-common/src/main/java/com/nu/dto/ElderTagSyncLogInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/ElderTagSyncLogInfoMQDto.java new file mode 100644 index 0000000..f45c792 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/ElderTagSyncLogInfoMQDto.java @@ -0,0 +1,51 @@ +package com.nu.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Description: 长者标签-镜像-日志-指令详情表 + * @Author: jeecg-boot + * @Date: 2026-02-25 + * @Version: V1.0 + */ +@Data +public class ElderTagSyncLogInfoMQDto implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**nu_config_elder_tag_sync_log_main.id*/ + private String pkId; + /**创建日期*/ + private Date createTime; + /**标签类型nu_elder_tag_type.id*/ + private String type; + /**标签类型中文名*/ + private String typeName; + /**标签名称*/ + private String tagName; + /**说明*/ + private String describ; + /**价格*/ + private BigDecimal price; + /**默认图标*/ + private String pic; + /**焦点图标*/ + private String picFocus; + /**所属机构*/ + private String sysOrgCode; +} diff --git a/nursing-unit-common/src/main/java/com/nu/dto/ElderTagSyncLogMainMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/ElderTagSyncLogMainMQDto.java new file mode 100644 index 0000000..d790715 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/ElderTagSyncLogMainMQDto.java @@ -0,0 +1,33 @@ +package com.nu.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @Description: 长者标签-镜像-日志-主表 + * @Author: jeecg-boot + * @Date: 2026-02-25 + * @Version: V1.0 + */ +@Data +public class ElderTagSyncLogMainMQDto implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**哪个机构镜像的*/ + private String opeOrgCode; + /**镜像的哪个机构的标签*/ + private String targetOrgCode; + /**标签镜像码*/ + private String orgTagCode; + /**创建人*/ + private String createBy; + /**创建日期*/ + private Date createTime; + + private List infoList; +} diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/mq/eldertag/listener/ElderTaggMQListener.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/mq/eldertag/listener/ElderTaggMQListener.java index 611b80f..43b92dd 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/mq/eldertag/listener/ElderTaggMQListener.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/mq/eldertag/listener/ElderTaggMQListener.java @@ -1,14 +1,12 @@ package com.nu.mq.eldertag.listener; +import cn.hutool.core.bean.BeanUtil; 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.QueryWrapper; import com.google.common.collect.Maps; -import com.nu.dto.ElderInfoMQDto; -import com.nu.dto.ElderTagAsyncMQDto; -import com.nu.dto.ElderTagTypeMQDto; -import com.nu.dto.StatusMQDto; +import com.nu.dto.*; import com.nu.entity.NuWxNoticeEntity; import com.nu.entity.WxNoticeEntity; import com.nu.enums.MQStatus; @@ -20,6 +18,14 @@ import com.nu.modules.canaddeldertag.entity.CanAddElderTag; 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.eldertagopelog.entity.ElderTagOpeLogInfo; +import com.nu.modules.eldertagopelog.entity.ElderTagOpeLogMain; +import com.nu.modules.eldertagopelog.service.IElderTagOpeLogInfoService; +import com.nu.modules.eldertagopelog.service.IElderTagOpeLogMainService; +import com.nu.modules.eldertagsynclog.entity.ElderTagSyncLogInfo; +import com.nu.modules.eldertagsynclog.entity.ElderTagSyncLogMain; +import com.nu.modules.eldertagsynclog.service.IElderTagSyncLogInfoService; +import com.nu.modules.eldertagsynclog.service.IElderTagSyncLogMainService; import com.nu.modules.eldertagtypere.entity.ElderTagTypeRe; import com.nu.modules.eldertagtypere.service.IElderTagTypeReService; import com.nu.modules.wxnotice.IWxNoticeApi; @@ -34,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.Date; +import java.util.List; import java.util.Map; @Slf4j @@ -52,6 +59,14 @@ public class ElderTaggMQListener { private IElderInfoService elderInfoService; @Autowired private IWxNoticeApi wxNoticeApi; + @Autowired + private IElderTagSyncLogMainService elderTagSyncLogMainService; + @Autowired + private IElderTagSyncLogInfoService elderTagSyncLogInfoService; + @Autowired + private IElderTagOpeLogMainService elderTagOpeLogMainService; + @Autowired + private IElderTagOpeLogInfoService elderTagOpeLogInfoService; /** * 其他平台新增指令 @@ -217,4 +232,24 @@ public class ElderTaggMQListener { } } } + + @RabbitListener(bindings = @QueueBinding(value = @Queue(name = "zzbq.synccode.log"), exchange = @Exchange(name = "hldy.zzbq", type = ExchangeTypes.DIRECT), key = "zzbq.synccode.log"), errorHandler = "directiveMQErrorHandler") + public void handleDirectiveSyncLog(ElderTagSyncLogMainMQDto dto) { + ElderTagSyncLogMain main = new ElderTagSyncLogMain(); + BeanUtils.copyProperties(dto,main); + elderTagSyncLogMainService.save(main); + + List infoList = BeanUtil.copyToList(dto.getInfoList(), ElderTagSyncLogInfo.class); + elderTagSyncLogInfoService.saveBatch(infoList); + } + + @RabbitListener(bindings = @QueueBinding(value = @Queue(name = "hldy.elderTag.ope"), exchange = @Exchange(name = "hldy.elderTag", type = ExchangeTypes.DIRECT), key = "hldy.elderTag.ope"), errorHandler = "directiveMQErrorHandler") + public void handleDirectiveOpeLog(ElderTagOpeLogMainMQDto dto) { + ElderTagOpeLogMain main = new ElderTagOpeLogMain(); + BeanUtils.copyProperties(dto,main); + elderTagOpeLogMainService.save(main); + + List infoList = BeanUtil.copyToList(dto.getInfoList(), ElderTagOpeLogInfo.class); + elderTagOpeLogInfoService.saveBatch(infoList); + } }