From f14cc470aacfc3fcd087dfd19259d230a1d2e60c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 28 Jan 2025 23:16:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=91IoT=EF=BC=9A=E8=A7=A3=E5=86=B3=E7=89=A9=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=20identifier=20=E5=AD=98=E5=9C=A8=E9=A9=BC?=
 =?UTF-8?q?=E5=B3=B0=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=8F=92=E5=85=A5=E5=92=8C=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/iot/dal/tdengine/IotDevicePropertyMapper.java  | 2 +-
 .../resources/mapper/device/IotDevicePropertyMapper.xml   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/IotDevicePropertyMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/IotDevicePropertyMapper.java
index 8ca8bcecbb..f2d6af97e9 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/IotDevicePropertyMapper.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/IotDevicePropertyMapper.java
@@ -33,7 +33,7 @@ public interface IotDevicePropertyMapper {
                                             List<TDengineTableField> oldFields,
                                             List<TDengineTableField> newFields) {
         oldFields.removeIf(field -> StrUtil.equalsAny(field.getField(),
-                TDengineTableField.FIELD_TS, "device_key", "report_time"));
+                TDengineTableField.FIELD_TS, "report_time"));
         List<TDengineTableField> addFields = newFields.stream().filter( // 新增的字段
                         newField -> oldFields.stream().noneMatch(oldField -> oldField.getField().equals(newField.getField())))
                 .collect(Collectors.toList());
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/device/IotDevicePropertyMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/device/IotDevicePropertyMapper.xml
index 7a3c3eb6f8..bdc40e8330 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/device/IotDevicePropertyMapper.xml
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/device/IotDevicePropertyMapper.xml
@@ -51,7 +51,7 @@
         TAGS ('${device.deviceKey}')
         (ts, report_time,
         <foreach item="key" collection="properties.keys" separator=",">
-            ${key}
+            ${@cn.hutool.core.util.StrUtil@toUnderlineCase(key)}
         </foreach>
         )
         VALUES
@@ -67,9 +67,9 @@
     </select>
 
     <select id="selectPageByHistory" resultType="cn.iocoder.yudao.module.iot.controller.admin.device.vo.data.IotDevicePropertyRespVO">
-        SELECT ${reqVO.identifier} AS `value`, ts AS update_time
-        FROM device_property_${reqVO.deviceKey}1
-        WHERE ${reqVO.identifier} IS NOT NULL
+        SELECT ${@cn.hutool.core.util.StrUtil@toUnderlineCase(reqVO.identifier)} AS `value`, ts AS update_time
+        FROM device_property_${reqVO.deviceKey}
+        WHERE ${@cn.hutool.core.util.StrUtil@toUnderlineCase(reqVO.identifier)} IS NOT NULL
           AND ts BETWEEN ${@cn.hutool.core.date.LocalDateTimeUtil@toEpochMilli(reqVO.times[0])}
               AND ${@cn.hutool.core.date.LocalDateTimeUtil@toEpochMilli(reqVO.times[1])}
         ORDER BY ts DESC