From 3605702209a1ebc55195b54afc1cd2f1399cbab0 Mon Sep 17 00:00:00 2001 From: zq Date: Fri, 5 Dec 2025 18:07:12 +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=E7=B0=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 --- .../com/xzzn/ems/domain/EmsBatteryCluster.java | 15 +++++++++++++++ .../xzzn/ems/domain/vo/BMSBatteryClusterVo.java | 15 +++++++++++++++ .../impl/DeviceDataProcessServiceImpl.java | 10 ++++++---- .../mapper/ems/EmsBatteryClusterMapper.xml | 5 +++++ 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryCluster.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryCluster.java index e1a00c3..2bc12c1 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryCluster.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryCluster.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 com.xzzn.common.utils.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -21,6 +23,11 @@ public class EmsBatteryCluster 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; @@ -223,6 +230,14 @@ public class EmsBatteryCluster 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/BMSBatteryClusterVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryClusterVo.java index dfae301..020ade0 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryClusterVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryClusterVo.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 BMSBatteryClusterVo { /** 设备名称 */ private String deviceName; + /** 数据更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date dataUpdateTime; + /** 工作状态 */ private String workStatus; @@ -70,6 +77,14 @@ public class BMSBatteryClusterVo { 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 7ca6ba2..c4ee196 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 @@ -182,12 +182,12 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i batteryGroupDataProcess(siteId, deviceId, jsonData); batteryDataProcessFromBmsd(siteId, deviceId, jsonData, dataUpdateTime); } else if (deviceId.contains(SiteDevice.BMSC.name())) { - batteryClusterDataProcess(siteId, deviceId, jsonData); + batteryClusterDataProcess(siteId, deviceId, jsonData, dataUpdateTime); batteryDataProcessFromBmsc(siteId, deviceId, jsonData, dataUpdateTime); } else if (deviceId.contains(SiteDevice.PCS.name())) { pcsDataProcess(siteId, deviceId, jsonData, dataUpdateTime); pcsBranchDataProcess(siteId, deviceId, jsonData); - batteryClusterDataProcess(siteId, jsonData); + batteryClusterDataProcess(siteId, jsonData, dataUpdateTime); } else if (deviceId.contains(SiteDevice.LOAD.name())) { loadDataProcess(siteId, deviceId, jsonData, dataUpdateTime); } else if (deviceId.contains(SiteDevice.METEGF.name()) @@ -560,7 +560,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i } } - private void batteryClusterDataProcess(String siteId, String deviceId, String dataJson) { + private void batteryClusterDataProcess(String siteId, String deviceId, String dataJson, Date dataUpdateTime) { Map obj = JSON.parseObject(dataJson, new TypeReference>() { }); @@ -576,6 +576,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i saveDeviceData(pointMatchList, obj, data); + data.setDataUpdateTime(dataUpdateTime); data.setWorkStatus(WorkStatus.NORMAL.getCode()); // 或其他默认值 data.setPcsCommunicationStatus(CommunicationStatus.OK.getCode()); data.setEmsCommunicationStatus(CommunicationStatus.OK.getCode()); @@ -812,7 +813,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i } - private void batteryClusterDataProcess(String siteId, String dataJson) { + private void batteryClusterDataProcess(String siteId, String dataJson, Date dataUpdateTime) { if (!SiteEnum.DDS.getCode().equals(siteId)) { return; } @@ -831,6 +832,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i //BMSC 电池簇 EmsBatteryCluster data = new EmsBatteryCluster(); // 其他非 BigDecimal 字段 + data.setDataUpdateTime(dataUpdateTime); data.setWorkStatus(WorkStatus.NORMAL.getCode()); // 或其他默认值 data.setPcsCommunicationStatus(CommunicationStatus.OK.getCode()); data.setEmsCommunicationStatus(CommunicationStatus.OK.getCode()); diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml index 6268281..e64219f 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml @@ -6,6 +6,7 @@ + @@ -68,6 +69,7 @@