From 4856d88455a3d8d6cfb5f36c921181ce33bba038 Mon Sep 17 00:00:00 2001
From: wangwei_123 <1255324804@qq.com>
Date: Mon, 26 Jan 2026 15:37:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=A4=9A=E7=A7=9F=E6=88=B7tdengine?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/iocoder/yudao/module/hand/vo/HandDataVo.java    | 3 +++
 .../yudao-module-hand/src/main/resources/mapper/TdengineMapper.xml   | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

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 ff15482..338f109 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
@@ -36,6 +36,9 @@ public class HandDataVo {
     @Schema(description = "持有人姓名")
     private String name;
 
+    @Schema(description = "手持报警器内置名称")
+    private String userName;
+
     @Schema(description = "围栏id")
     private String fenceIds;
 
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 364466d..e5a4735 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
@@ -13,7 +13,8 @@
         INSERT INTO
         <foreach collection="logList" item="log" separator=" ">
             <!-- 动态拼接子表名 -->
-            hand_original_log_${log.sn}
+            hand_original_log_${log.tenantId}_${log.sn}
+
             <!-- 指定超级表 -->
             USING hand_original_log
             <!-- 自动建表所需的 TAGS -->
@@ -28,7 +29,7 @@
         INSERT INTO
         <foreach collection="dataVoList" item="log" separator=" ">
             <!-- 1. 表名加反引号 -->
-            `device_data_log_${log.sn}`
+            `device_data_log_${log.tenantId}_${log.sn}`
 
             <!-- 2. 指定超级表 -->
             USING device_data_log