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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
fengrong 2024-11-26 10:45:48 +08:00
commit a0822f9546
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,18 +369,18 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
deviceEventInfo.setConfirmed(0); deviceEventInfo.setConfirmed(0);
if (!StringUtils.isEmpty(eventType) && eventType.equals("遥信变位")) { if (!StringUtils.isEmpty(eventType) && eventType.equals("遥信变位")) {
if (item.getAttrValue().equals(0)) { if (item.getAttrValue().equals(0)) {
deviceEventInfo.setEventText(fieldName + " 复归"); deviceEventInfo.setEventText(item.getAttrCode()+fieldName + " 复归");
deviceEventInfo.setEventLevel(0); deviceEventInfo.setEventLevel(0);
} else { } else {
deviceEventInfo.setEventText(fieldName + " 动作"); deviceEventInfo.setEventText(item.getAttrCode()+fieldName + " 动作");
Integer level = dataService.eventLevelMap.get(model).get(item.getAttrCode()); Integer level = dataService.eventLevelMap.get(model).get(item.getAttrCode());
log.info("level:{}",level); log.info("level:{}",level);
log.info("fieldname{}",fieldName); log.info("fieldname{}",fieldName);
deviceEventInfo.setEventLevel( level == null ? 0 : level); deviceEventInfo.setEventLevel( level == null ? 0 : level);
} }
} else { } else {
deviceEventInfo.setEventText(fieldName + eventType + ",属性值为：" + item.getAttrValue() + ",越限值为：" + item.getLimitValue()); deviceEventInfo.setEventText(item.getAttrCode()+fieldName + eventType + ",属性值为：" + item.getAttrValue() + ",越限值为：" + item.getLimitValue());
deviceEventInfo.setEventLevel(1); deviceEventInfo.setEventLevel(1);
} }
valueList.add(deviceEventInfo); valueList.add(deviceEventInfo);