From 6f873100decc93c30ca65504888382d2f2a466b2 Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Wed, 04 Jul 2018 13:31:49 +0800 Subject: [PATCH] 优化 --- src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java index 7c6d8bf..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); -- Gitblit v1.8.0