From 1d1e1b80e38248a89a1532281291fadca1bdbaca Mon Sep 17 00:00:00 2001 From: huguanghan Date: Fri, 1 Nov 2024 10:18:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=AE=BE=E5=A4=87id?= =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8Bcode=E6=98=A0=E5=B0=84=E7=BC=93?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/das/modules/data/service/TDEngineService.java | 5 +---- .../java/com/das/modules/node/domain/bo/CalculateRTData.java | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/das/src/main/java/com/das/modules/data/service/TDEngineService.java b/das/src/main/java/com/das/modules/data/service/TDEngineService.java index 96e89188..ab5c991b 100644 --- a/das/src/main/java/com/das/modules/data/service/TDEngineService.java +++ b/das/src/main/java/com/das/modules/data/service/TDEngineService.java @@ -32,9 +32,6 @@ public class TDEngineService { private HikariDataSource hikariDataSource; - @Autowired - private DataServiceImpl dataService; - @Value("${tdengine.url}") private String url; @@ -353,7 +350,7 @@ public class TDEngineService { sb.append("c"); sb.append(dv.getDeviceId()); sb.append(" using c_"); - sb.append(dataService.deviceModelMap.get(dv.getDeviceId().toString())); + sb.append(dv.getModelCode()); sb.append("_").append(dv.getIotModelField()); sb.append(" tags ("); sb.append(dv.getDeviceId()); diff --git a/das/src/main/java/com/das/modules/node/domain/bo/CalculateRTData.java b/das/src/main/java/com/das/modules/node/domain/bo/CalculateRTData.java index da619244..6b549cba 100644 --- a/das/src/main/java/com/das/modules/node/domain/bo/CalculateRTData.java +++ b/das/src/main/java/com/das/modules/node/domain/bo/CalculateRTData.java @@ -20,4 +20,6 @@ public class CalculateRTData { private Object dataValue; private String iotModelField; + + private String modelCode; }