From 42a9f9490f05eb865bb83ebe852d7e002eb25a71 Mon Sep 17 00:00:00 2001
From: zhuangtianxiang <2913129173@qq.com>
Date: Mon, 24 Mar 2025 18:31:57 +0800
Subject: [PATCH] =?UTF-8?q?feat(iot):=20=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=8A=B6=E6=80=81=E7=9B=91=E6=8E=A7=E5=92=8C=E5=9C=B0?=
 =?UTF-8?q?=E7=90=86=E5=9D=90=E6=A0=87=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 Device 模型中添加 deviceState 字段，用于表示设备运行状态- 在 DeviceDto 中添加 longitude 和 latitude 字段，用于表示设备经纬度
- 修改 RecordDataServiceImpl 中的数据处理逻辑，增加设备状态更新
- 在数据库中添加相关字段和默认值设置
---
 src/main/resources/mappers/iot/DeviceMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mappers/iot/DeviceMapper.xml b/src/main/resources/mappers/iot/DeviceMapper.xml
index 6f4ad9c..d16c7d0 100644
--- a/src/main/resources/mappers/iot/DeviceMapper.xml
+++ b/src/main/resources/mappers/iot/DeviceMapper.xml
@@ -82,7 +82,7 @@
         where d.id = #{id}
     </select>
 
-    <select id="selectPageByConditions" resultType="com.zsc.edu.gateway.modules.iot.device.entity.Device">
+    <select id="selectPageByConditions" resultMap="BaseResultMap">
         SELECT d.*, p.*
         FROM iot_device d
         LEFT JOIN iot_product p ON d.product_id = p.id
@@ -96,7 +96,7 @@
             <if test="query.state != null and query.state  != ''">
                 AND d.state = #{query.state}
             </if>
-            <if test="query.isOnline != null and query.isOnline  != ''">
+            <if test="query.isOnline != null">
                 AND d.online = #{query.isOnline}
             </if>
             <if test="query.productId != null and query.productId  != ''">