From 05b9559e62630af94af811171e1375aa24dda304 Mon Sep 17 00:00:00 2001 From: chenhaojie Date: Fri, 9 Aug 2024 08:53:49 +0800 Subject: [PATCH] =?UTF-8?q?das=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../das/modules/node/service/TDEngineService.java | 12 ++++++++---- .../modules/node/service/impl/DataServiceImpl.java | 12 ++++++++++++ .../node/service/impl/SysNodeServiceImpl.java | 1 + 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/das/src/main/java/com/das/modules/node/service/TDEngineService.java b/das/src/main/java/com/das/modules/node/service/TDEngineService.java index e1c7993f..e8a99555 100644 --- a/das/src/main/java/com/das/modules/node/service/TDEngineService.java +++ b/das/src/main/java/com/das/modules/node/service/TDEngineService.java @@ -105,9 +105,11 @@ public class TDEngineService { sb.setLength(0); sb.append("insert into "); for (RTData dv : list) { - sb.append(iotModelCode); + sb.append("d"); sb.append(dv.getDeviceId()); - sb.append(" using analog tags ("); + sb.append(" using " ); + sb.append(iotModelCode); + sb.append(" tags ("); sb.append(dv.getDeviceId()); sb.append(","); sb.append(1L); @@ -137,9 +139,11 @@ public class TDEngineService { sb.setLength(0); sb.append("insert into "); for (RTData dv : list) { - sb.append(iotModelCode); + sb.append("d"); sb.append(dv.getDeviceId()); - sb.append(" using analog tags ("); + sb.append(" using " ); + sb.append(iotModelCode); + sb.append(" tags ("); sb.append(dv.getDeviceId()); sb.append(","); sb.append(1L); diff --git a/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java index 2f2ef4ea..0d97daf2 100644 --- a/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java +++ b/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java @@ -124,6 +124,13 @@ public class DataServiceImpl implements DataService { } else { info.setParams(equipObjectMapper.readTree(info.getParams().toString())); } + if (("138").equals(info.getType())) { + info.setType("yc"); + } else if (("139").equals(info.getType())) { + info.setType("ym"); + } else if (("140").equals(info.getType())) { + info.setType("yx"); + } newIotModelFieldList.add(info); } } @@ -135,6 +142,11 @@ public class DataServiceImpl implements DataService { }else { info.setParams(equipObjectMapper.readTree(info.getParams().toString())); } + if (("146").equals(info.getType())) { + info.setType("yt"); + } else if (("147").equals(info.getType())) { + info.setType("yk"); + } newIotModelServiceList.add(info); } } diff --git a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java index ddbd4bbe..723ca06f 100644 --- a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java +++ b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java @@ -75,6 +75,7 @@ public class SysNodeServiceImpl implements SysNodeService { @Autowired private SysIotModelMapper sysIotModelMapper; + @Autowired TerminalMessageEventHandler terminalMessageEventHandler; @Override