From ff93ecd1f2cb4c5ae8459430dd3e09fedad0e3ea Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 13:53:04 +0800
Subject: [PATCH] device 增加 过滤 为删除条件 修复
---
src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java | 9 ++++++++-
1 files changed, 8 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..bacf3b2 100644
--- a/src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java
@@ -8,6 +8,7 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -127,6 +128,12 @@
public List<Map<String, Object>> getAlarmDataByMonth(Map<String, Object> parameters) {
LocalDate localDate = LocalDate.now();
List<Sensor> sensors = sensorMapper.selectAll();
+ Iterator<Sensor> iterator = sensors.iterator();
+ while (iterator.hasNext()) {
+ if ("warn".equals(iterator.next().getSensorKey())) {
+ iterator.remove();
+ }
+ }
parameters.put("start", localDate.with(TemporalAdjusters.firstDayOfMonth()));
parameters.put("end", localDate.with(TemporalAdjusters.firstDayOfNextMonth()));
parameters.put("sensors", sensors);
@@ -146,7 +153,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