修改websocketserver批量处理确认功能

kaiyu

2020-10-26 80ed4c1a5a0b8d5a87cf0e5a0885e9267c3d28a3

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

@@ -146,7 +155,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;