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 querySysIotModelField(@RequestBody SysIotModelFieldDto sysIotModelFieldDto) { if (sysIotModelFieldDto.getPageNum() == null && sysIotModelFieldDto.getPageSize() == null){ List 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 highList = new ArrayList<>(); -// List 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