From 9f0d5abf47bfce97c34bd879aae330520277029f Mon Sep 17 00:00:00 2001
From: wangwei_123 <1255324804@qq.com>
Date: Wed, 28 Jan 2026 15:31:51 +0800
Subject: [PATCH] =?UTF-8?q?tdengine=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/mqtt/processor/BatchDeviceMessageProcessor.java    | 10 ++++++++++
 .../main/java/cn/iocoder/yudao/module/hand/vo/HandDataVo.java |  9 +++++++++
 .../java/cn/iocoder/yudao/module/hand/vo/TdengineDataVo.java  | 10 ++++++++++
 .../src/main/resources/mapper/TdengineMapper.xml              | 11 ++++++++---
 .../yudao-server/src/main/resources/application.yaml          |  2 +-
 5 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java b/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java
index c99b48a..f5d30f2 100644
--- a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java
+++ b/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java
@@ -25,6 +25,7 @@ import org.springframework.core.task.TaskExecutor;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.stereotype.Component;
 
+import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -443,6 +444,15 @@ public class BatchDeviceMessageProcessor {
             String battery = json.getStr("battery");
 
             String user = json.getStr("user");
+
+            Integer boot = json.getInt("boot");
+            String sig = json.getStr("sig");
+            Long mem = json.getLong("mem");
+
+
+            device.setBoot(boot);
+            device.setSig(sig);
+            device.setMem(mem);
             device.setUserName(user);
             device.setValue(gasValue);
             device.setSn(sn);
diff --git a/cc-admin-master/yudao-module-hand/src/main/java/cn/iocoder/yudao/module/hand/vo/HandDataVo.java b/cc-admin-master/yudao-module-hand/src/main/java/cn/iocoder/yudao/module/hand/vo/HandDataVo.java
index 338f109..cf077ce 100644
--- a/cc-admin-master/yudao-module-hand/src/main/java/cn/iocoder/yudao/module/hand/vo/HandDataVo.java
+++ b/cc-admin-master/yudao-module-hand/src/main/java/cn/iocoder/yudao/module/hand/vo/HandDataVo.java
@@ -118,4 +118,13 @@ public class HandDataVo {
 
     @Schema(description = "最后推送等级")
     private Double lastPushValue;
+
+    @Schema(description = "开机时间(秒)")
+    private Integer boot;
+
+    @Schema(description = "信号强度")
+    private String sig;
+
+    @Schema(description = "内存")
+    private Long mem;
 }
diff --git a/cc-admin-master/yudao-module-hand/src/main/java/cn/iocoder/yudao/module/hand/vo/TdengineDataVo.java b/cc-admin-master/yudao-module-hand/src/main/java/cn/iocoder/yudao/module/hand/vo/TdengineDataVo.java
index 0a6269b..2ade741 100644
--- a/cc-admin-master/yudao-module-hand/src/main/java/cn/iocoder/yudao/module/hand/vo/TdengineDataVo.java
+++ b/cc-admin-master/yudao-module-hand/src/main/java/cn/iocoder/yudao/module/hand/vo/TdengineDataVo.java
@@ -34,6 +34,16 @@ public class TdengineDataVo {
     @Schema(description = "持有人姓名")
     private String name;
 
+    @Schema(description = "开机时间(秒)")
+    private Integer boot;
+
+    @Schema(description = "信号强度")
+    private String sig;
+
+    @Schema(description = "内存")
+    private Long mem;
+
+
     @Schema(description = "租户id")
     private Long tenantId;
 
diff --git a/cc-admin-master/yudao-module-hand/src/main/resources/mapper/TdengineMapper.xml b/cc-admin-master/yudao-module-hand/src/main/resources/mapper/TdengineMapper.xml
index e5a4735..c572c3e 100644
--- a/cc-admin-master/yudao-module-hand/src/main/resources/mapper/TdengineMapper.xml
+++ b/cc-admin-master/yudao-module-hand/src/main/resources/mapper/TdengineMapper.xml
@@ -37,14 +37,16 @@
             <!-- 3. 标签 -->
             TAGS(#{log.sn}, #{log.tenantId})
 
+            (ts,battery,value,longitude,latitude,name,boot_seconds,signal_str,mem_bytes)
+
             VALUES
-            (#{log.ts}, #{log.battery}, #{log.value}, #{log.longitude}, #{log.latitude}, #{log.name})
+            (#{log.ts}, #{log.battery}, #{log.value}, #{log.longitude}, #{log.latitude}, #{log.name}, #{log.boot}, #{log.sig},#{log.mem})
         </foreach>
     </insert>
 
     <select id="selectPage" resultType="cn.iocoder.yudao.module.hand.vo.TdengineDataVo">
         SELECT
-        ts, sn, battery, `value`, longitude, latitude, `name`,tenantId
+        ts, sn, battery, `value`, longitude, latitude, `name`,boot_seconds as boot,signal_str as  sig,mem_bytes as mem,tenantId
         FROM
         device_data_log
         <where>
@@ -97,7 +99,10 @@
         LAST(`value`) as `value`,
         LAST(`battery`) as `battery`,
         LAST(longitude) as longitude,
-        LAST(latitude) as latitude
+        LAST(latitude) as latitude,
+        LAST(boot_seconds) as boot,
+        LAST(signal_str) as sig,
+        LAST(mem_bytes) as mem
         FROM
         device_data_log
         <where>
diff --git a/cc-admin-master/yudao-server/src/main/resources/application.yaml b/cc-admin-master/yudao-server/src/main/resources/application.yaml
index be33b8a..628b13f 100644
--- a/cc-admin-master/yudao-server/src/main/resources/application.yaml
+++ b/cc-admin-master/yudao-server/src/main/resources/application.yaml
@@ -2,7 +2,7 @@ spring:
   application:
     name: gas_mobile
   profiles:
-    active: prod
+    active: local
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。