From 8ea24dd5fb6e1b24d3a7ef62a0060ef516f8f759 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 24 May 2018 08:58:16 +0800
Subject: [PATCH] 更新 监测点 数据

---
 src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java
index 2fb7446..7c6d8bf 100644
--- a/src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java
@@ -146,7 +146,7 @@
 			for (Sensor sensor : sensors) {
 				if (!entry.getValue().toString().equals("0") && entry.getKey().equals(sensor.getSensorKey())) {
 					Map<String, Object> map2 = new HashMap<String, Object>();
-					map2.put(sensor.getName(), entry.getValue());
+					map2.put(sensor.getDescription(), entry.getValue());
 					resultList.add(map2);
 					sensors.remove(sensor);
 					break;

--
Gitblit v1.8.0