From b4b78e03b114374502ff28ec53eba554a5a82aa2 Mon Sep 17 00:00:00 2001 From: zq Date: Fri, 5 Dec 2025 18:16:50 +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-BMS=E7=94=B5=E6=B1=A0=E5=A0=86=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/EmsBatteryStack.java | 15 +++++++++++++++ .../com/xzzn/ems/domain/vo/BMSOverViewVo.java | 15 +++++++++++++++ .../impl/DeviceDataProcessServiceImpl.java | 5 +++-- .../mapper/ems/EmsBatteryStackMapper.xml | 5 +++++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryStack.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryStack.java index 117d9f1..3240398 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryStack.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryStack.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 EmsBatteryStack 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; + /** 工作状态：0-正常 1-异常 2-停止 */ @Excel(name = "工作状态：0-正常 1-异常 2-停止") private String workStatus; @@ -254,6 +261,14 @@ public class EmsBatteryStack extends BaseEntity return id; } + public Date getDataUpdateTime() { + return dataUpdateTime; + } + + public void setDataUpdateTime(Date dataUpdateTime) { + this.dataUpdateTime = dataUpdateTime; + } + public void setWorkStatus(String workStatus) { this.workStatus = workStatus; diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSOverViewVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSOverViewVo.java index 3aac017..53f351f 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSOverViewVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSOverViewVo.java @@ -1,6 +1,9 @@ package com.xzzn.ems.domain.vo; +import com.fasterxml.jackson.annotation.JsonFormat; + import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -12,6 +15,10 @@ public class BMSOverViewVo { /** 设备名称 */ private String deviceName; + /** 数据更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date dataUpdateTime; + /** 工作状态 */ private String workStatus; @@ -67,6 +74,14 @@ public class BMSOverViewVo { this.deviceName = deviceName; } + public Date getDataUpdateTime() { + return dataUpdateTime; + } + + public void setDataUpdateTime(Date dataUpdateTime) { + this.dataUpdateTime = dataUpdateTime; + } + public String getWorkStatus() { return workStatus; } 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 c4ee196..0c8b166 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 @@ -178,7 +178,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i redisCache.setCacheObject(RedisKeyConstants.SYNC_DATA + siteId + "_" + deviceId, obj, 1, TimeUnit.MINUTES); if (deviceId.contains(SiteDevice.BMSD.name())) { - batteryStackDataProcess(siteId, deviceId, jsonData); + batteryStackDataProcess(siteId, deviceId, jsonData, dataUpdateTime); batteryGroupDataProcess(siteId, deviceId, jsonData); batteryDataProcessFromBmsd(siteId, deviceId, jsonData, dataUpdateTime); } else if (deviceId.contains(SiteDevice.BMSC.name())) { @@ -294,7 +294,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i } - private void batteryStackDataProcess(String siteId, String deviceId, String dataJson) { + private void batteryStackDataProcess(String siteId, String deviceId, String dataJson, Date dataUpdateTime) { //电池堆 Map obj = JSON.parseObject(dataJson, new TypeReference>() { @@ -314,6 +314,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i EmsBatteryStack dataStack = new EmsBatteryStack(); // 其他非 BigDecimal 字段 + dataStack.setDataUpdateTime(dataUpdateTime); dataStack.setWorkStatus(WorkStatus.NORMAL.getCode()); // 或其他默认值 dataStack.setPcsCommunicationStatus(CommunicationStatus.OK.getCode()); dataStack.setEmsCommunicationStatus(CommunicationStatus.OK.getCode()); diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml index 2494b08..d6b8d72 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml @@ -6,6 +6,7 @@ + @@ -75,6 +76,7 @@