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

ems-system/src/main/java/com/xzzn/ems/domain/EmsDhData.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 EmsDhData extends BaseEntity
     /** $column.columnComment */
     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;
+
     /** 湿度 */
     @Excel(name = "湿度")
     private BigDecimal humidity;
@@ -46,6 +53,14 @@ public class EmsDhData extends BaseEntity
         return id;
     }
 
+    public Date getDataUpdateTime() {
+        return dataUpdateTime;
+    }
+
+    public void setDataUpdateTime(Date dataUpdateTime) {
+        this.dataUpdateTime = dataUpdateTime;
+    }
+
     public void setHumidity(BigDecimal humidity)
     {
         this.humidity = humidity;

ems-system/src/main/java/com/xzzn/ems/domain/vo/DhDataVo.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;
 
 /**
  * 动环数据
@@ -12,6 +14,10 @@ public class DhDataVo {
     /** 设备唯一标识符 */
     private String deviceId;
 
+    /** 数据更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dataUpdateTime;
+
     /** 动环名称 */
     private String deviceName;
 
@@ -29,6 +35,14 @@ public class DhDataVo {
         this.deviceId = deviceId;
     }
 
+    public Date getDataUpdateTime() {
+        return dataUpdateTime;
+    }
+
+    public void setDataUpdateTime(Date dataUpdateTime) {
+        this.dataUpdateTime = dataUpdateTime;
+    }
+
     public String getDeviceName() {
         return deviceName;
     }

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

@@ -197,7 +197,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
             } else if (deviceId.contains("XF")) {
                 meteXFProcess(siteId, deviceId, jsonData, dataUpdateTime);
             } else if (deviceId.contains(SiteDevice.DH.name()) || deviceId.contains(SiteDevice.donghuan.name())) {
-                dhDataProcess(siteId, deviceId, jsonData);
+                dhDataProcess(siteId, deviceId, jsonData, dataUpdateTime);
             } else if (deviceId.contains(SiteDevice.ZSLQ.name())) {
                 coolingDataProcess(siteId, deviceId, jsonData, dataUpdateTime);
             }
@@ -267,7 +267,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
         emsDevicesSettingMapper.updateEmsDevicesSetting(emsDevicesSetting);
     }
 
-    private void dhDataProcess(String siteId, String deviceId, String dataJson) {
+    private void dhDataProcess(String siteId, String deviceId, String dataJson, Date dateUpdateTime) {
         //动环
         Map<String, Object> obj = JSON.parseObject(dataJson, new TypeReference<Map<String, Object>>() {
         });
@@ -283,6 +283,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
 
         saveDeviceData(pointMatchList, obj, dhData);
 
+        dhData.setDataUpdateTime(dateUpdateTime);
         dhData.setCreateBy("system");
         dhData.setCreateTime(DateUtils.getNowDate());
         dhData.setUpdateBy("system");

ems-system/src/main/resources/mapper/ems/EmsDhDataMapper.xml

@@ -6,6 +6,7 @@
 
     <resultMap type="EmsDhData" id="EmsDhDataResult">
         <result property="id"    column="id"    />
+        <result property="dataUpdateTime"    column="data_update_time"    />
         <result property="humidity"    column="humidity"    />
         <result property="temperature"    column="temperature"    />
         <result property="createBy"    column="create_by"    />
@@ -18,12 +19,13 @@
     </resultMap>
 
     <sql id="selectEmsDhDataVo">
-        select id, humidity, temperature, create_by, create_time, update_by, update_time, remark, site_id, device_id from ems_dh_data
+        select id, data_update_time，humidity, temperature, create_by, create_time, update_by, update_time, remark, site_id, device_id from ems_dh_data
     </sql>
 
     <select id="selectEmsDhDataList" parameterType="EmsDhData" resultMap="EmsDhDataResult">
         <include refid="selectEmsDhDataVo"/>
         <where>
+            <if test="dataUpdateTime != null "> and data_update_time = #{dataUpdateTime}</if>
             <if test="humidity != null "> and humidity = #{humidity}</if>
             <if test="temperature != null "> and temperature = #{temperature}</if>
             <if test="siteId != null  and siteId != ''"> and site_id = #{siteId}</if>
@@ -39,6 +41,7 @@
     <insert id="insertEmsDhData" parameterType="EmsDhData" useGeneratedKeys="true" keyProperty="id">
         insert into ems_dh_data
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="dataUpdateTime != null">data_update_time,</if>
             <if test="humidity != null">humidity,</if>
             <if test="temperature != null">temperature,</if>
             <if test="createBy != null">create_by,</if>
@@ -50,6 +53,7 @@
             <if test="deviceId != null and deviceId != ''">device_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="dataUpdateTime != null">#{dataUpdateTime},</if>
             <if test="humidity != null">#{humidity},</if>
             <if test="temperature != null">#{temperature},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -65,6 +69,7 @@
     <update id="updateEmsDhData" parameterType="EmsDhData">
         update ems_dh_data
         <trim prefix="SET" suffixOverrides=",">
+            <if test="dataUpdateTime != null">data_update_time = #{dataUpdateTime},</if>
             <if test="humidity != null">humidity = #{humidity},</if>
             <if test="temperature != null">temperature = #{temperature},</if>
             <if test="createBy != null">create_by = #{createBy},</if>