fengxiang
2018-05-07 267dbb29a3c31e371d1a5cb9171be5a416ecf778
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);
               }
            }
         }