From e2580dbcbef964c2705435f039e8fffbc33871bc Mon Sep 17 00:00:00 2001 From: huguanghan Date: Tue, 26 Nov 2024 10:44:41 +0800 Subject: [PATCH] =?UTF-8?q?deviceEvent=E5=86=85=E5=AE=B9=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?attrCode?= 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 b10311e2..25990ec8 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 @@ -369,18 +369,18 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node deviceEventInfo.setConfirmed(0); if (!StringUtils.isEmpty(eventType) && eventType.equals("遥信变位")) { if (item.getAttrValue().equals(0)) { - deviceEventInfo.setEventText(fieldName + " 复归"); + deviceEventInfo.setEventText(item.getAttrCode()+fieldName + " 复归"); deviceEventInfo.setEventLevel(0); } else { - deviceEventInfo.setEventText(fieldName + " 动作"); + deviceEventInfo.setEventText(item.getAttrCode()+fieldName + " 动作"); Integer level = dataService.eventLevelMap.get(model).get(item.getAttrCode()); log.info("level:{}",level); log.info("fieldname{}",fieldName); deviceEventInfo.setEventLevel( level == null ? 0 : level); } } else { - deviceEventInfo.setEventText(fieldName + eventType + ",属性值为：" + item.getAttrValue() + ",越限值为：" + item.getLimitValue()); + deviceEventInfo.setEventText(item.getAttrCode()+fieldName + eventType + ",属性值为：" + item.getAttrValue() + ",越限值为：" + item.getLimitValue()); deviceEventInfo.setEventLevel(1); } valueList.add(deviceEventInfo);