From 27d0d095ab38b9556196718929ba92193204cacb Mon Sep 17 00:00:00 2001 From: huguanghan Date: Wed, 11 Dec 2024 10:34:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=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 --- .../service/impl/NodeMessageServiceImpl.java | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 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 35b49241..93b24a75 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 @@ -251,26 +251,31 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node Map lowSpeedValueMap = new HashMap<>(); //数据入redis - Iterator keysHigh = values.fieldNames(); - while (keysHigh.hasNext()) { - String fieldName = keysHigh.next(); - String key = String.format("RT:%s:%s", deviceId, fieldName.toLowerCase()); - keyValueMap.put(key, values.get(fieldName)); - } - log.info("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)); + if (values != null){ + Iterator keysHigh = values.fieldNames(); + while (keysHigh.hasNext()) { + String fieldName = keysHigh.next(); + String key = String.format("RT:%s:%s", deviceId, fieldName.toLowerCase()); + keyValueMap.put(key, values.get(fieldName)); } + log.info("values解析成功"); + } + + if (archiveValues != null){ + 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)); + } + } + log.info("archive解析成功"); } - log.info("archive解析成功"); //更新td if (!highSpeedValueMap.isEmpty()) { List highSpeedData = new ArrayList<>(); From 4944ab604abc975c0f80d8e416d0fc845098bc96 Mon Sep 17 00:00:00 2001 From: huguanghan Date: Wed, 11 Dec 2024 10:40:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=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 --- .../modules/node/service/impl/NodeMessageServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 93b24a75..daec5399 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 @@ -266,12 +266,12 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node while (archiveKeys.hasNext()) { String fieldName = archiveKeys.next(); String key = String.format("RT:%s:%s", deviceId, fieldName.toLowerCase()); - keyValueMap.put(key, values.get(fieldName)); + keyValueMap.put(key, archiveValues.get(fieldName)); if (highKey.contains(fieldName)) { - highSpeedValueMap.put(fieldName, values.get(fieldName)); + highSpeedValueMap.put(fieldName, archiveValues.get(fieldName)); } if (lowKey.contains(fieldName)) { - lowSpeedValueMap.put(fieldName, values.get(fieldName)); + lowSpeedValueMap.put(fieldName, archiveValues.get(fieldName)); } } log.info("archive解析成功");