feat(iot): 为设备消息和属性添加时间戳处理

haohao · YunaiV
1 parent 47c093ad
Showing 4 changed files with 8 additions and 3 deletions
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/message/IotDeviceMessageServiceImpl.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java
yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/device/IotDeviceMessageMapper.xml
yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/device/IotDevicePropertyMapper.xml
@@ -95,6 +95,9 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService {
         if (messageDO.getData() != null) {
             messageDO.setData(JsonUtils.toJsonString(messageDO.getData()));
         }
+        if (messageDO.getTs() == null) {
+            messageDO.setTs(System.currentTimeMillis());
+        }
         try {
             deviceMessageMapper.insert(messageDO);
         } catch (Exception ex) {
@@ -179,7 +179,9 @@ public class IotDevicePropertyServiceImpl implements IotDevicePropertyService {
             log.error("[saveDeviceProperty][消息({}) 没有合法的属性]", message);
         } else {
             // 2.1 保存设备属性【数据】
-            devicePropertyMapper.insert(device, properties, LocalDateTimeUtil.toEpochMilli(message.getReportTime()));
+            devicePropertyMapper.insert(device, properties,
+                    System.currentTimeMillis(),
+                    LocalDateTimeUtil.toEpochMilli(message.getReportTime()));
  
             // 2.2 保存设备属性【日志】
             Map<String, IotDevicePropertyDO> properties2 = convertMap(properties.entrySet(), Map.Entry::getKey, entry ->
@@ -38,7 +38,7 @@
         USING device_message
         TAGS (#{deviceId})
         VALUES (
-            NOW, #{id}, #{reportTime}, #{tenantId},  #{serverId},
+            #{ts}, #{id}, #{reportTime}, #{tenantId},  #{serverId},
             #{upstream}, #{reply}, #{identifier}, #{requestId}, #{method}, 
             #{params}, #{data}, #{code}, #{msg}
         )
@@ -55,7 +55,7 @@
         </foreach>
         )
         VALUES
-        (NOW, #{reportTime},
+        (#{ts}, #{reportTime},
         <foreach item="value" collection="properties.values" separator=",">
             #{value}
         </foreach>