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

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

@ -251,26 +251,31 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
Map<String, Object> lowSpeedValueMap = new HashMap<>(); Map<String, Object> lowSpeedValueMap = new HashMap<>();
//数据入redis //数据入redis
Iterator<String> keysHigh = values.fieldNames(); if (values != null){
while (keysHigh.hasNext()) { Iterator<String> keysHigh = values.fieldNames();
String fieldName = keysHigh.next(); while (keysHigh.hasNext()) {
String key = String.format("RT:%s:%s", deviceId, fieldName.toLowerCase()); String fieldName = keysHigh.next();
keyValueMap.put(key, values.get(fieldName)); String key = String.format("RT:%s:%s", deviceId, fieldName.toLowerCase());
} keyValueMap.put(key, values.get(fieldName));
log.info("values解析成功");
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));
if (highKey.contains(fieldName)) {
highSpeedValueMap.put(fieldName, values.get(fieldName));
}
if (lowKey.contains(fieldName)) {
lowSpeedValueMap.put(fieldName, 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, archiveValues.get(fieldName));
if (highKey.contains(fieldName)) {
highSpeedValueMap.put(fieldName, archiveValues.get(fieldName));
}
if (lowKey.contains(fieldName)) {
lowSpeedValueMap.put(fieldName, archiveValues.get(fieldName));
}
}
log.info("archive解析成功");
} }
log.info("archive解析成功");
//更新td //更新td
if (!highSpeedValueMap.isEmpty()) { if (!highSpeedValueMap.isEmpty()) {
List<RTData> highSpeedData = new ArrayList<>(); List<RTData> highSpeedData = new ArrayList<>();