From edc2e6f69b3c28cccbc88495f18870fc5ddef707 Mon Sep 17 00:00:00 2001 From: huguanghan Date: Fri, 6 Dec 2024 16:47:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E9=87=8F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../node/service/impl/NodeMessageServiceImpl.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java index a7cb163f..1c458a88 100644 --- a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java +++ b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java @@ -240,7 +240,6 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node JsonNode jsonNode = data.getData(); String deviceId = jsonNode.get("deviceId").asText(); JsonNode values = jsonNode.get("values"); - JsonNode archiveValues = jsonNode.get("archiveValues"); Long dataTime = jsonNode.get("dataTime").asLong(); Map keyValueMap = new HashMap<>(); String modelCode = dataService.deviceModelMap.get(deviceId); @@ -255,21 +254,15 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node String fieldName = keysHigh.next(); String key = String.format("RT:%s:%s", deviceId, fieldName.toLowerCase()); keyValueMap.put(key, values.get(fieldName)); - } - if (jsonNode.get("isStore") != null && jsonNode.get("isStore").asBoolean()) { - archiveValues = values; - } - Iterator archiveKeys = archiveValues.fieldNames(); - while (archiveKeys.hasNext()) { - String fieldName = archiveKeys.next(); - String key = String.format("RT:%s:%s", deviceId, fieldName.toLowerCase()); - keyValueMap.put(key, values.get(fieldName)); if (highKey.contains(fieldName)){ highSpeedValueMap.put(fieldName,values.get(fieldName)); } if (lowKey.contains(fieldName)){ lowSpeedValueMap.put(fieldName,values.get(fieldName)); } + } + adminRedisTemplate.mSet(keyValueMap); + if (jsonNode.get("isStore") != null && jsonNode.get("isStore").asBoolean()) { //更新td if (!highSpeedValueMap.isEmpty()){ List highSpeedData = new ArrayList<>(); @@ -285,7 +278,6 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node tdEngineService.updateYCLowValues(lowSpeedData,modelCode); } } - adminRedisTemplate.mSet(keyValueMap); } @Override