From 267dbb29a3c31e371d1a5cb9171be5a416ecf778 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 07 May 2018 13:51:01 +0800
Subject: [PATCH] 地图相关资源
---
src/main/java/com/moral/service/impl/AlarmServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
index c07e707..8b97ca5 100644
--- a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
@@ -70,18 +70,20 @@
Map<String, Object> alarmData = alarmDatas.get(0);
List<String> sensors = (List<String>) parameters.get("sensors");
List list = new ArrayList();
- for (String key : alarmData.keySet()) {
- for (String sensor : sensors) {
- String[] split = sensor.split("-");
- if (key.equals(split[0]) && !"0".equals(alarmData.get(key).toString())) {
- Map<String, Object> map = new HashMap<String, Object>();
- if (parameters.containsKey("description")) {
- map.put("name", split[3]);
- } else {
- map.put("name", split[1]);
+ if (!ObjectUtils.isEmpty(alarmData)) {
+ for (String key : alarmData.keySet()) {
+ for (String sensor : sensors) {
+ String[] split = sensor.split("-");
+ if (key.equals(split[0]) && !"0".equals(alarmData.get(key).toString())) {
+ Map<String, Object> map = new HashMap<String, Object>();
+ if (parameters.containsKey("description")) {
+ map.put("name", split[3]);
+ } else {
+ map.put("name", split[1]);
+ }
+ map.put("value", alarmData.get(key));
+ list.add(map);
}
- map.put("value", alarmData.get(key));
- list.add(map);
}
}
}
--
Gitblit v1.8.0