sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.jsspisoft.com/ry-das

Browse Source
This commit is contained in:
zhouhuang 2024-12-11 10:41:56 +08:00
commit cf35246594
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
View File

@ -251,6 +251,7 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
Map<String, Object> lowSpeedValueMap = new HashMap<>();
//数据入redis
if (values != null){
Iterator<String> keysHigh = values.fieldNames();
while (keysHigh.hasNext()) {
String fieldName = keysHigh.next();
@ -258,19 +259,23 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
keyValueMap.put(key, values.get(fieldName));
}
log.info("values解析成功");
}
if (archiveValues != null){
Iterator<String> 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));
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解析成功");
}
//更新td
if (!highSpeedValueMap.isEmpty()) {
List<RTData> highSpeedData = new ArrayList<>();