From 8044157d1db9bcf8653fa8ae874fcaffc7690f7d Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 9 Mar 2026 15:13:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nu/dto/NuBaseInfoMQDto.java | 21 ++++++ .../modules/elderinfo/entity/ElderInfo.java | 4 +- .../device/listener/IotSyncBizMQListener.java | 70 +++++++++---------- .../controller/NuBaseInfoController.java | 10 ++- 4 files changed, 66 insertions(+), 39 deletions(-) diff --git a/nursing-unit-common/src/main/java/com/nu/dto/NuBaseInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/NuBaseInfoMQDto.java index 74019019..3f3dc1e0 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/NuBaseInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/NuBaseInfoMQDto.java @@ -1,6 +1,9 @@ package com.nu.dto; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; @@ -28,4 +31,22 @@ public class NuBaseInfoMQDto implements Serializable { * 护理单元编码 */ private String nuId; + + + + private java.lang.String id; + private java.lang.String nuName; + private java.lang.String areaFlag; + private java.lang.String status; + private java.lang.String customerId; + private java.lang.String delFlag; + private java.lang.String createBy; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + private java.lang.String updateBy; + private java.util.Date updateTime; + private java.lang.String sysOrgCode; + private java.lang.String izSync; } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java index 1c138461..6ef05bef 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java @@ -382,8 +382,8 @@ public class ElderInfo implements Serializable { /** * 长者入住时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date checkinTime; @TableField(exist = false) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java index f24435d5..b39635b9 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java @@ -70,41 +70,41 @@ public class IotSyncBizMQListener { private void saveSyncBizInfo(IotSyncBizMQDto dto) { List statusList = new ArrayList<>(); - IotNuBaseInfoMQDto iotNuBaseInfoMQDto = dto.getNuBaseInfo(); - try { - NuBaseInfoEntity entity = nuBaseInfoApi.getOneByNuId(iotNuBaseInfoMQDto.getNuId()); - StatusMQDto statusMQDto = new StatusMQDto(); - statusMQDto.setAsyncId(iotNuBaseInfoMQDto.getId()); - statusMQDto.setMessage("成功"); - statusMQDto.setPrimaryKey(iotNuBaseInfoMQDto.getLogId()); - statusMQDto.setNote("区域"); - if(entity!=null){ - if(iotNuBaseInfoMQDto.getDelFlag().equals(entity.getDelFlag())){ - statusMQDto.setMessage("忽略"); - }else{ - entity.setDelFlag(iotNuBaseInfoMQDto.getDelFlag()); - NuBaseInfoEntity nuBaseInfo = new NuBaseInfoEntity(); - BeanUtils.copyProperties(entity, nuBaseInfo); - nuBaseInfo.setSysOrgCode(iotNuBaseInfoMQDto.getOrgCode()); - nuBaseInfoApi.updateById(nuBaseInfo); - } - }else{ - NuBaseInfoEntity nuBaseInfo = new NuBaseInfoEntity(); - BeanUtils.copyProperties(iotNuBaseInfoMQDto, nuBaseInfo); - nuBaseInfo.setSysOrgCode(iotNuBaseInfoMQDto.getOrgCode()); - nuBaseInfo.setStatus("0"); - nuBaseInfoApi.save(nuBaseInfo); - } - statusList.add(statusMQDto); - } catch (Exception e) { - StatusMQDto statusMQDto = new StatusMQDto(); - statusMQDto.setAsyncId(iotNuBaseInfoMQDto.getId()); - statusMQDto.setMessage("失败"); - statusMQDto.setPrimaryKey(iotNuBaseInfoMQDto.getLogId()); - statusMQDto.setNote("区域"); - statusList.add(statusMQDto); - e.printStackTrace(); - } +// IotNuBaseInfoMQDto iotNuBaseInfoMQDto = dto.getNuBaseInfo(); +// try { +// NuBaseInfoEntity entity = nuBaseInfoApi.getOneByNuId(iotNuBaseInfoMQDto.getNuId()); +// StatusMQDto statusMQDto = new StatusMQDto(); +// statusMQDto.setAsyncId(iotNuBaseInfoMQDto.getId()); +// statusMQDto.setMessage("成功"); +// statusMQDto.setPrimaryKey(iotNuBaseInfoMQDto.getLogId()); +// statusMQDto.setNote("区域"); +// if(entity!=null){ +// if(iotNuBaseInfoMQDto.getDelFlag().equals(entity.getDelFlag())){ +// statusMQDto.setMessage("忽略"); +// }else{ +// entity.setDelFlag(iotNuBaseInfoMQDto.getDelFlag()); +// NuBaseInfoEntity nuBaseInfo = new NuBaseInfoEntity(); +// BeanUtils.copyProperties(entity, nuBaseInfo); +// nuBaseInfo.setSysOrgCode(iotNuBaseInfoMQDto.getOrgCode()); +// nuBaseInfoApi.updateById(nuBaseInfo); +// } +// }else{ +// NuBaseInfoEntity nuBaseInfo = new NuBaseInfoEntity(); +// BeanUtils.copyProperties(iotNuBaseInfoMQDto, nuBaseInfo); +// nuBaseInfo.setSysOrgCode(iotNuBaseInfoMQDto.getOrgCode()); +// nuBaseInfo.setStatus("0"); +// nuBaseInfoApi.save(nuBaseInfo); +// } +// statusList.add(statusMQDto); +// } catch (Exception e) { +// StatusMQDto statusMQDto = new StatusMQDto(); +// statusMQDto.setAsyncId(iotNuBaseInfoMQDto.getId()); +// statusMQDto.setMessage("失败"); +// statusMQDto.setPrimaryKey(iotNuBaseInfoMQDto.getLogId()); +// statusMQDto.setNote("区域"); +// statusList.add(statusMQDto); +// e.printStackTrace(); +// } List cameraList = dto.getCameraInfoList(); if(cameraList!=null&&cameraList.size()>0){ 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 76046667..a32a608d 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 @@ -3,6 +3,7 @@ package com.nu.modules.nubaseinfo.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nu.dto.NuBaseInfoMQDto; import com.nu.modules.nubaseinfo.entity.NuBaseInfo; import com.nu.modules.nubaseinfo.service.INuBaseInfoService; import com.nu.utils.RabbitMQUtil; @@ -16,6 +17,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -139,7 +141,9 @@ public class NuBaseInfoController extends JeecgController edit(@RequestBody NuBaseInfo nuBaseInfo) { nuBaseInfoService.updateById(nuBaseInfo); - rabbitMQUtil.sendToExchange("hldy.hldy", "hldy.async.updateBase", nuBaseInfo); + NuBaseInfoMQDto nuBaseInfoMQDto = new NuBaseInfoMQDto(); + BeanUtils.copyProperties(nuBaseInfo, nuBaseInfoMQDto); + rabbitMQUtil.sendToExchange("hldy.hldy", "hldy.async.updateBase", nuBaseInfoMQDto); return Result.OK("操作成功!"); }