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);
@@ -136,9 +143,11 @@
         @Override
         public int compare(Entry<String, Object> o1, Entry<String, Object> o2) {
            if (o2.getValue().equals(o1.getValue())) {
               return Integer.compare(Integer.valueOf(o1.getKey().replace("e", "")),Integer.valueOf(o2.getKey().replace("e", "")));
               return o1.getKey().compareTo(o2.getKey());
               //return Integer.compare(Integer.valueOf(o1.getKey().replace("e", "")),Integer.valueOf(o2.getKey().replace("e", "")));
            } else {
               return Integer.valueOf(o2.getValue().toString()).compareTo(Integer.valueOf(o1.getValue().toString()));
            }
            return Integer.valueOf(o2.getValue().toString()).compareTo(Integer.valueOf(o1.getValue().toString()));
         }
      });
      List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();