From aa97a6128546633e7408d2acf2d62f3ec92314ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=BE=E9=85=92?= <dqwzam0@163.com>
Date: Mon, 30 Dec 2024 09:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3bug,=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=B5=81=E9=87=8F=E8=AE=A1=E8=AE=BE=E5=A4=87=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fastbee/iot/domain/NgFlowDeviceData.java    | 4 ++--
 .../main/resources/mapper/iot/DeviceReportInfoMapper.xml | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgFlowDeviceData.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgFlowDeviceData.java
index 8a7f79a..0f46d21 100644
--- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgFlowDeviceData.java
+++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgFlowDeviceData.java
@@ -43,7 +43,7 @@ private static final long serialVersionUID = 1L;
 
     /** 实时时间 */
             @JsonFormat(pattern = "yyyy-MM-dd")
-            @Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd")
+            @Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
             @ApiModelProperty("实时时间")
     private Date realTime;
 
@@ -54,7 +54,7 @@ private static final long serialVersionUID = 1L;
 
     /** 保存时间 */
             @JsonFormat(pattern = "yyyy-MM-dd")
-            @Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd")
+            @Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
             @ApiModelProperty("保存时间")
     private Date saveTime;
 
diff --git a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml
index 6b1ff76..31fe8d0 100644
--- a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml
+++ b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml
@@ -112,6 +112,9 @@
             <if test="type != null">type,</if>
             <if test="longitude != null">longitude,</if>
             <if test="latitude != null">latitude,</if>
+            <if test="onLine != null">on_line,</if>
+            <if test="areaCode != null">area_code,</if>
+            <if test="deptId != null">dept_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="imei != null and imei != ''">#{imei},</if>
@@ -140,6 +143,9 @@
             <if test="type != null">#{type},</if>
             <if test="longitude != null">#{longitude},</if>
             <if test="latitude != null">#{latitude},</if>
+            <if test="onLine != null">#{onLine},</if>
+            <if test="areaCode != null">#{areaCode},</if>
+            <if test="deptId != null">#{deptId},</if>
         </trim>
     </insert>
 
@@ -172,6 +178,9 @@
             <if test="type != null">type = #{type},</if>
             <if test="longitude != null">longitude = #{longitude},</if>
             <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="onLine != null">on_line = #{onLine},</if>
+            <if test="areaCode != null">area_code = #{areaCode},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
         </trim>
         where id = #{id}
     </update>