Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-04 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2

Merge remote-tracking branch 'origin/master'

 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);