xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

平台修改意见20251120-BMS电池堆新增字段-数据更新时间

Browse Source
This commit is contained in:
zq
2025-12-05 18:16:50 +08:00
parent 3605702209
commit b4b78e03b1
4 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryStack.java
View File

@ -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;

15
ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSOverViewVo.java
View File

@ -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;
}

5
ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java
View File

@ -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<String, Object> obj = JSON.parseObject(dataJson, new TypeReference<Map<String, Object>>() {
@ -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());

5
ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
View File

@ -6,6 +6,7 @@
<resultMap type="EmsBatteryStack" id="EmsBatteryStackResult">
<result property="id" column="id" />
<result property="dataUpdateTime" column="data_update_time" />
<result property="workStatus" column="work_status" />
<result property="pcsCommunicationStatus" column="pcs_communication_status" />
<result property="emsCommunicationStatus" column="ems_communication_status" />
@ -75,6 +76,7 @@
<select id="selectEmsBatteryStackList" parameterType="EmsBatteryStack" resultMap="EmsBatteryStackResult">
<include refid="selectEmsBatteryStackVo"/>
<where>
<if test="dataUpdateTime != null "> and data_update_time = #{dataUpdateTime}</if>
<if test="workStatus != null and workStatus != ''"> and work_status = #{workStatus}</if>
<if test="pcsCommunicationStatus != null and pcsCommunicationStatus != ''"> and pcs_communication_status = #{pcsCommunicationStatus}</if>
<if test="emsCommunicationStatus != null and emsCommunicationStatus != ''"> and ems_communication_status = #{emsCommunicationStatus}</if>
@ -142,6 +144,7 @@
<insert id="insertEmsBatteryStack" parameterType="EmsBatteryStack" useGeneratedKeys="true" keyProperty="id">
insert into ems_battery_stack
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="dataUpdateTime != null">data_update_time,</if>
<if test="workStatus != null">work_status,</if>
<if test="pcsCommunicationStatus != null">pcs_communication_status,</if>
<if test="emsCommunicationStatus != null">ems_communication_status,</if>
@ -204,6 +207,7 @@
<if test="circuitBreakerStatus != null">circuit_breaker_status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="dataUpdateTime != null">#{dataUpdateTime},</if>
<if test="workStatus != null">#{workStatus},</if>
<if test="pcsCommunicationStatus != null">#{pcsCommunicationStatus},</if>
<if test="emsCommunicationStatus != null">#{emsCommunicationStatus},</if>
@ -270,6 +274,7 @@
<update id="updateEmsBatteryStack" parameterType="EmsBatteryStack">
update ems_battery_stack
<trim prefix="SET" suffixOverrides=",">
<if test="dataUpdateTime != null">data_update_time = #{dataUpdateTime},</if>
<if test="workStatus != null">work_status = #{workStatus},</if>
<if test="pcsCommunicationStatus != null">pcs_communication_status = #{pcsCommunicationStatus},</if>
<if test="emsCommunicationStatus != null">ems_communication_status = #{emsCommunicationStatus},</if>