Merge branch 'master' of http://182.92.163.198:3000/18610965287/hand_device

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;
 

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