From 3313c7f9cd6f762eeeb9559d1b6178a08dba119a Mon Sep 17 00:00:00 2001 From: zq Date: Fri, 5 Dec 2025 18:33:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BF=AE=E6=94=B9=E6=84=8F?= =?UTF-8?q?=E8=A7=8120251120-=E5=8A=A8=E7=8E=AF=E8=AE=BE=E5=A4=87=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5-=E6=95=B0=E6=8D=AE=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xzzn/ems/domain/EmsDhData.java | 15 +++++++++++++++ .../java/com/xzzn/ems/domain/vo/DhDataVo.java | 14 ++++++++++++++ .../impl/DeviceDataProcessServiceImpl.java | 5 +++-- .../main/resources/mapper/ems/EmsDhDataMapper.xml | 7 ++++++- 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsDhData.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsDhData.java index eb2d35c..9d1552f 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsDhData.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsDhData.java @@ -1,7 +1,9 @@ package com.xzzn.ems.domain; import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import com.xzzn.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -20,6 +22,11 @@ public class EmsDhData extends BaseEntity /** $column.columnComment */ private Long id; + /** 数据更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "数据更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date dataUpdateTime; + /** 湿度 */ @Excel(name = "湿度") private BigDecimal humidity; @@ -46,6 +53,14 @@ public class EmsDhData extends BaseEntity return id; } + public Date getDataUpdateTime() { + return dataUpdateTime; + } + + public void setDataUpdateTime(Date dataUpdateTime) { + this.dataUpdateTime = dataUpdateTime; + } + public void setHumidity(BigDecimal humidity) { this.humidity = humidity; diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/DhDataVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/DhDataVo.java index d42c8af..6c17ae0 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/DhDataVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/DhDataVo.java @@ -1,8 +1,10 @@ package com.xzzn.ems.domain.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.xzzn.common.annotation.Excel; import java.math.BigDecimal; +import java.util.Date; /** * 动环数据 @@ -12,6 +14,10 @@ public class DhDataVo { /** 设备唯一标识符 */ private String deviceId; + /** 数据更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date dataUpdateTime; + /** 动环名称 */ private String deviceName; @@ -29,6 +35,14 @@ public class DhDataVo { this.deviceId = deviceId; } + public Date getDataUpdateTime() { + return dataUpdateTime; + } + + public void setDataUpdateTime(Date dataUpdateTime) { + this.dataUpdateTime = dataUpdateTime; + } + public String getDeviceName() { return deviceName; } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java index f689a87..4e2a344 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java @@ -197,7 +197,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i } else if (deviceId.contains("XF")) { meteXFProcess(siteId, deviceId, jsonData, dataUpdateTime); } else if (deviceId.contains(SiteDevice.DH.name()) || deviceId.contains(SiteDevice.donghuan.name())) { - dhDataProcess(siteId, deviceId, jsonData); + dhDataProcess(siteId, deviceId, jsonData, dataUpdateTime); } else if (deviceId.contains(SiteDevice.ZSLQ.name())) { coolingDataProcess(siteId, deviceId, jsonData, dataUpdateTime); } @@ -267,7 +267,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i emsDevicesSettingMapper.updateEmsDevicesSetting(emsDevicesSetting); } - private void dhDataProcess(String siteId, String deviceId, String dataJson) { + private void dhDataProcess(String siteId, String deviceId, String dataJson, Date dateUpdateTime) { //动环 Map obj = JSON.parseObject(dataJson, new TypeReference>() { }); @@ -283,6 +283,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i saveDeviceData(pointMatchList, obj, dhData); + dhData.setDataUpdateTime(dateUpdateTime); dhData.setCreateBy("system"); dhData.setCreateTime(DateUtils.getNowDate()); dhData.setUpdateBy("system"); diff --git a/ems-system/src/main/resources/mapper/ems/EmsDhDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsDhDataMapper.xml index 8844d1c..7205839 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsDhDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsDhDataMapper.xml @@ -6,6 +6,7 @@ + @@ -18,12 +19,13 @@ - select id, humidity, temperature, create_by, create_time, update_by, update_time, remark, site_id, device_id from ems_dh_data + select id, data_update_time，humidity, temperature, create_by, create_time, update_by, update_time, remark, site_id, device_id from ems_dh_data