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

平台修改意见20251120-液冷设备新增字段-数据更新时间

Browse Source
This commit is contained in:
zq
2025-12-05 18:25:39 +08:00
parent b4b78e03b1
commit 70c990051b
4 changed files with 37 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/EmsCoolingData.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 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;

14
ems-system/src/main/java/com/xzzn/ems/domain/vo/CoolingDataViewVo.java
View File

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

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

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