From f74fd7281a4d6b0176692078052a6281eaafcc41 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 25 Apr 2018 13:10:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/AlarmServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
index f04bc52..3d56965 100644
--- a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
@@ -67,7 +67,11 @@
String[] split = sensor.split("-");
if (key.equals(split[0]) && !"0".equals(alarmData.get(key).toString())) {
Map<String, Object> map = new HashMap<String, Object>();
- map.put("name", split[1]);
+ if (parameters.containsKey("description")) {
+ map.put("name", split[3]);
+ } else {
+ map.put("name", split[1]);
+ }
map.put("value", alarmData.get(key));
list.add(map);
}
--
Gitblit v1.8.0