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 - hand_original_log_${log.sn} + hand_original_log_${log.tenantId}_${log.sn} + USING hand_original_log @@ -28,7 +29,7 @@ INSERT INTO - `device_data_log_${log.sn}` + `device_data_log_${log.tenantId}_${log.sn}` USING device_data_log