From 820f54a55b2dba2ad8522422d6b3608f354ac913 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Mon, 28 Oct 2024 11:17:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysIotModelController.java     |  2 +-
 .../node/service/impl/DataServiceImpl.java    | 20 -------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java b/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
index 3120e0fc..e6e347c6 100644
--- a/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
+++ b/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
@@ -95,7 +95,7 @@ public class SysIotModelController {
     public PageDataInfo<SysIotModelFieldVo> querySysIotModelField(@RequestBody SysIotModelFieldDto sysIotModelFieldDto) {
         if (sysIotModelFieldDto.getPageNum() == null && sysIotModelFieldDto.getPageSize() == null){
             List<SysIotModelFieldVo> sysIotModelFieldVos = sysIotModelService.queryAllModelField(sysIotModelFieldDto);
-            return new PageDataInfo<>(sysIotModelFieldVos,sysIotModelFieldVos.size());
+            return PageDataInfo.build(sysIotModelFieldVos,sysIotModelFieldVos.size());
         }
         return sysIotModelService.querySysIotModelField(sysIotModelFieldDto);
     }
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 91010580..63a5e295 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
@@ -235,7 +235,6 @@ public class DataServiceImpl implements DataService {
 
     @Override
     public void handleData(TerminalMessage data) {
-        // 先从redis里面获取设备的初始化数据
         JsonNode jsonNode = data.getData();
         String deviceId = jsonNode.get("deviceId").asText();
         JsonNode values = jsonNode.get("values");
@@ -249,25 +248,6 @@ public class DataServiceImpl implements DataService {
             keyValueMap.put(key,values.get(fieldName));
         }
         adminRedisTemplate.mSet(keyValueMap);
-//        Long dataTime = data.getTime();
-//
-//        // 存入td库
-//        List<RTData> highList = new ArrayList<>();
-//        List<RTData> lowList = new ArrayList<>();
-//        RTData rtHighData = RTData.builder()
-//                .dataTime(dataTime)
-//                .deviceId(Long.valueOf(deviceId))
-//                .values(highFieldMap)
-//                .build();
-//        RTData rtLowData = RTData.builder()
-//                .dataTime(dataTime)
-//                .deviceId(Long.valueOf(deviceId))
-//                .values(highFieldMap)
-//                .build();
-//        highList.add(rtHighData);
-//        lowList.add(rtLowData);
-//        tdEngineService.updateYCHighValues(highList, iotModelCode);
-//        tdEngineService.updateYCLowValues(lowList, iotModelCode);
     }
 
     @Override