From 70c990051b24ccf4eede09be915f4ae5a895051d Mon Sep 17 00:00:00 2001 From: zq Date: Fri, 5 Dec 2025 18:25:39 +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-=E6=B6=B2=E5=86=B7=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 --- .../java/com/xzzn/ems/domain/EmsCoolingData.java | 15 +++++++++++++++ .../com/xzzn/ems/domain/vo/CoolingDataViewVo.java | 14 ++++++++++++++ .../impl/DeviceDataProcessServiceImpl.java | 5 +++-- .../resources/mapper/ems/EmsCoolingDataMapper.xml | 5 +++++ 4 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsCoolingData.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsCoolingData.java index 2e85dc8..d539cd2 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsCoolingData.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsCoolingData.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 EmsCoolingData extends BaseEntity /** */ 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; + /** 系统名称，如1#液冷 */ @Excel(name = "系统名称，如1#液冷") private String systemName; @@ -102,6 +109,14 @@ public class EmsCoolingData extends BaseEntity return id; } + public Date getDataUpdateTime() { + return dataUpdateTime; + } + + public void setDataUpdateTime(Date dataUpdateTime) { + this.dataUpdateTime = dataUpdateTime; + } + public void setSystemName(String systemName) { this.systemName = systemName; diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/CoolingDataViewVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/CoolingDataViewVo.java index 9f19015..3ae5e4b 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/CoolingDataViewVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/CoolingDataViewVo.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; /** * 单站监控-液冷 @@ -13,6 +15,10 @@ public class CoolingDataViewVo { /** 设备名称 */ private String deviceName; + /** 数据更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date dataUpdateTime; + /** 供水温度 */ @Excel(name = "供水温度") private BigDecimal gsTemp; @@ -52,6 +58,14 @@ public class CoolingDataViewVo { this.deviceName = deviceName; } + public Date getDataUpdateTime() { + return dataUpdateTime; + } + + public void setDataUpdateTime(Date dataUpdateTime) { + this.dataUpdateTime = dataUpdateTime; + } + public BigDecimal getGsTemp() { return gsTemp; } 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 0c8b166..f689a87 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 @@ -199,12 +199,12 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i } else if (deviceId.contains(SiteDevice.DH.name()) || deviceId.contains(SiteDevice.donghuan.name())) { dhDataProcess(siteId, deviceId, jsonData); } else if (deviceId.contains(SiteDevice.ZSLQ.name())) { - coolingDataProcess(siteId, deviceId, jsonData); + coolingDataProcess(siteId, deviceId, jsonData, dataUpdateTime); } } } - private void coolingDataProcess(String siteId, String deviceId, String jsonData) { + private void coolingDataProcess(String siteId, String deviceId, String jsonData, Date dataUpdateTime) { //中水冷却 Map obj = JSON.parseObject(jsonData, new TypeReference>() { }); @@ -219,6 +219,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i saveDeviceData(pointMatchList, obj, coolingData); + coolingData.setDataUpdateTime(dataUpdateTime); coolingData.setCreateBy("system"); coolingData.setCreateTime(DateUtils.getNowDate()); coolingData.setUpdateBy("system"); diff --git a/ems-system/src/main/resources/mapper/ems/EmsCoolingDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsCoolingDataMapper.xml index ed058c2..0ed3595 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsCoolingDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsCoolingDataMapper.xml @@ -6,6 +6,7 @@ + @@ -38,6 +39,7 @@