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; }