导出数据接口update

于紫祥_1901

2020-11-20 b3a7d3d28ee5934a4f3fdb89b50c681667440c68

导出数据接口update

 src/main/java/com/moral/controller/ScreenController.java

@@ -2,6 +2,7 @@

import java.io.*;
import java.lang.reflect.Array;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.text.DateFormat;
import java.text.DecimalFormat;
@@ -19,6 +20,7 @@
import com.alibaba.fastjson.JSONArray;

import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.googlecode.aviator.AviatorEvaluator;
import com.googlecode.aviator.Expression;
import com.moral.common.bean.Constants;
@@ -36,6 +38,7 @@
import com.moral.entity.alarm.AlarmSensorLevel;
import com.moral.entity.charts.DataSortCondition;
import com.moral.entity.layout.RealTimeDeviceLayout;
import com.moral.mapper.HistoryMapper;
import com.moral.service.*;
import com.moral.util.*;

@@ -89,6 +92,9 @@
@Api(tags = "Screen", description = "大屏接口")
public class ScreenController {
    public static Logger log = Logger.getLogger(ScreenController.class);

    @Resource
    private HistoryMapper historyMapper;
    @Resource
    AlarmConfigService alarmConfigService;
    @Resource
@@ -2693,7 +2699,7 @@
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "monitorPointIds", value = "多个monitorid", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "time", value = "时间(格式：2020-03-19)", required = true, paramType = "query", dataType = "String")})
    public ResultBean<List<List<Map>>> monitorAVGData(HttpServletRequest request) throws Exception {
    public ResultBean<List<List<Map<String,Object>>>> monitorAVGData(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        String monitorPointIds = (String) parameters.get("monitorPointIds");
        String time = (String) parameters.get("time");
@@ -2706,18 +2712,71 @@
        String date1= simpleDateFormat.format(date);
        String date2= simpleDateFormat.format(calendar.getTime());
        String[] mIds = monitorPointIds.split(",");
        List<List<Map>> lists = new ArrayList<>();
        List<List<Map<String,Object>>> lists = new ArrayList<>();
        if (mIds.length==1 && mIds.length!=0){
            String mId = mIds[0];
            List<Map> dataAvbByMIdAndTime = historyHourlyService.getDataAvbByMIdAndTime(mId, date1, date2);
            List<Map<String,Object>> dataAvbByMIdAndTime = historyHourlyService.getDataAvbByMIdAndTime(mId, date1, date2);
            Double maxO3 = Double.parseDouble(dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 1).get("maxO3").toString());
            Map<String,Object> dailyAvgData =new HashMap<>();
            if (dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 2).get("data")!=""){
                dailyAvgData = (Map<String, Object>) dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 2).get("data");
                dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
            }else {
                dailyAvgData= historyHourlyService.getAvgDataByMId(mId, date1, date2);
                dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
            }
            dataAvbByMIdAndTime.remove(dataAvbByMIdAndTime.size() - 1);
            dataAvbByMIdAndTime.remove(dataAvbByMIdAndTime.size() - 1);
            Map<String,Object> dayMap = new HashMap<>();
            dayMap.put("data",dailyAvgData);
            dayMap.put("time",date1.substring(0,11));
            dataAvbByMIdAndTime.add(dayMap);
            for (int i = 0; i <dataAvbByMIdAndTime.size() ; i++) {
                if (i!=dataAvbByMIdAndTime.size()-1){
                    Map<String, Object> map1 = AQICalculation2.hourlyAQI((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data"));
                    if (Double.parseDouble(map1.get("AQI").toString())>=50.0){
                        ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("primary_pollutants",map1.get("maxSensor"));
                        ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("AQI",map1.get("AQI"));
                    }else {
                        ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("primary_pollutants","-");
                        ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("AQI",map1.get("AQI"));
                    }
                }else {
                    Map<String, Object> map1 = AQICalculation2.dayAQI((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data"));
                        if (Double.parseDouble(map1.get("AQI").toString())>=50.0){
                            ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("primary_pollutants",map1.get("maxSensor"));
                            ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("AQI",map1.get("AQI"));
                        }else {
                            ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("primary_pollutants","-");
                            ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("AQI",map1.get("AQI"));
                        }
                }
            }
            lists.add(dataAvbByMIdAndTime);
            //List<Device> devicesByMonitorPointId = deviceService.getDevicesByMonitorPointId(Integer.valueOf(mId));
        }else {
            for (int i = 0; i <mIds.length ; i++) {
                List<Map> dataAvbByMIdAndTime = historyHourlyService.getDataAvbByMIdAndTime(mIds[i], date1, date2);
                List<Map<String,Object>> dataAvbByMIdAndTime = historyHourlyService.getDataAvbByMIdAndTime(mIds[i], date1, date2);
                Double maxO3 = Double.parseDouble(dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 1).get("maxO3").toString());
                Map<String,Object> dailyAvgData =new HashMap<>();
                if (dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 2).get("data")!=""){
                    dailyAvgData = (Map<String, Object>) dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 2).get("data");
                    dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
                }else {
                    dailyAvgData= historyHourlyService.getAvgDataByMId(mIds[i], date1, date2);
                    dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
                }
                dataAvbByMIdAndTime.remove(dataAvbByMIdAndTime.size() - 1);
                dataAvbByMIdAndTime.remove(dataAvbByMIdAndTime.size() - 1);
                Map<String,Object> dayMap = new HashMap<>();
                dayMap.put("data",dailyAvgData);
                dayMap.put("time",date1.substring(0,11));
                dataAvbByMIdAndTime.add(dayMap);
                lists.add(dataAvbByMIdAndTime);
            }
            List<Map<String, Object>> dataByMonitorPoints = historyHourlyService.getDataByMonitorPoints(mIds, date1, date2);
            lists.add(dataByMonitorPoints);
        }
        return new ResultBean<List<List<Map>>>(lists);
        return new ResultBean<List<List<Map<String,Object>>>>(lists);
    }
}

 src/main/java/com/moral/mapper/HistoryHourlyMapper.java

@@ -3,6 +3,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.security.access.method.P;

import java.lang.reflect.Array;
import java.util.List;
import java.util.Map;

@@ -38,4 +39,17 @@
    List<Map<String,Object>> getDataAvbByMIdAndTime( @Param("mId")String mId,
                                                     @Param("startTime")String startTime,
                                                     @Param("endTime")String endTime);

    List<Map<String,Object>> getDataByMonitorPoints(@Param("mIds") String[] mIds,
                                                    @Param("startTime")String startTime,
                                                    @Param("endTime")String endTime);


    Map<String,Object> getAvgDataByMId(@Param("mId")String mId,
                                              @Param("startTime")String startTime,
                                              @Param("endTime")String endTime);

    Map<String,Object> getAvgDataByMIds(@Param("mIds")String[] mIds,
                                       @Param("startTime")String startTime,
                                       @Param("endTime")String endTime);
}

 src/main/java/com/moral/mapper/HistoryMapper.java

@@ -48,4 +48,6 @@
                       @Param("table") String table);



    Map<String,Object> getDailyAvgData(@Param("mId")String mId,@Param("time")String time);

    Map<String,Object> getDailyAvgDataByMIds(@Param("mIds")String[] mIds,@Param("time")String time);



}

 src/main/java/com/moral/service/HistoryHourlyService.java

@@ -1,5 +1,6 @@
package com.moral.service;

import java.lang.reflect.Array;
import java.util.List;
import java.util.Map;

@@ -27,5 +28,7 @@

    List<Map> getDataByMacAndTime(Map param);

    List<Map> getDataAvbByMIdAndTime(String mId,String startTime,String endTime);
    List<Map<String,Object>> getDataAvbByMIdAndTime(String mId,String startTime,String endTime);
    List<Map<String,Object>> getDataByMonitorPoints(String[] mIds, String startTime, String endTime);
    Map<String,Object> getAvgDataByMId(String mId,String startTime,String endTime);
}

 src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java

@@ -1,5 +1,6 @@
package com.moral.service.impl;

import java.lang.reflect.Array;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.ParseException;
@@ -258,9 +259,7 @@
    }

    @Override
    public List<Map> getDataAvbByMIdAndTime(String mId, String startTime, String endTime) {
        List<Device> devicesByMonitorPointId = deviceService.getDevicesByMonitorPointId(Integer.valueOf(mId));
        List<List> lists = new ArrayList<>();
    public List<Map<String,Object>> getDataAvbByMIdAndTime(String mId, String startTime, String endTime) {
        List<List<Map<String,String>>> listArrayList = new ArrayList<>();
        List<Map<String, Object>> dataAvbByMIdAndTime = historyHourlyMapper.getDataAvbByMIdAndTime(mId, startTime, endTime);
        List<Map> mapList = new ArrayList<>();
@@ -301,7 +300,7 @@
                            timeOfHour=timeOfHour+1;
                        }
                        O3_8.put("time", String.valueOf(timeOfHour));
                        O3_8.put("O3-8h", String.valueOf(avg1));
                        O3_8.put("O3_8h", String.valueOf(avg1));
                        mapList1.add(O3_8);
                    }else {
                        continue;
@@ -316,78 +315,186 @@
            List<Map<String, String>> mapList1 = listArrayList.get(0);
            List<Double> O3List = new ArrayList();
            for (Map<String, String> stringStringMap : mapList1) {
                O3List.add(Double.parseDouble(stringStringMap.get("O3-8h")));
                O3List.add(Double.parseDouble(stringStringMap.get("O3_8h")));
            }

            maxO3 = Collections.max(O3List);
            for (int i = 0; i <dataAvbByMIdAndTime.size() ; i++) {
                dataAvbByMIdAndTime.get(i).put("O3-8h",null);
                dataAvbByMIdAndTime.get(i).put("O3_8h","");
                int time = Integer.parseInt(((Object)dataAvbByMIdAndTime.get(i).get("time")).toString().substring(11,13)) ;
                for (int j = 0; j <mapList1.size() ; j++) {
                    int time1 = Integer.parseInt(mapList1.get(j).get("time").toString()) ;
                    if (time==time1){
                        Double O3_8h = Double.parseDouble(mapList1.get(j).get("O3-8h").toString());
                        dataAvbByMIdAndTime.get(i).put("O3-8h",new BigDecimal(O3_8h).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
                        Double O3_8h = Double.parseDouble(mapList1.get(j).get("O3_8h").toString());
                        dataAvbByMIdAndTime.get(i).put("O3_8h",new BigDecimal(O3_8h).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
                    }
                }
            }
        }
        Map<String, Object> dailyAvgData = historyMapper.getDailyAvgData(mId, startTime);
        if (dailyAvgData!=null){
            dailyAvgData.put("maxO3-8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
            dailyAvgData.put("time",startTime);
      Map<String, Object> dailyAvgData = historyMapper.getDailyAvgData(mId, startTime);
          if (dailyAvgData!=null){
            dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
        }
        if (dataAvbByMIdAndTime.size()>24){
            for (int i = 0; i <dataAvbByMIdAndTime.size()-1 ; i++) {
                Map<String, Object> map =dataAvbByMIdAndTime.get(i);
                Map<String, Object> map1 = AQICalculation2.hourlyAQI(map);
                dataAvbByMIdAndTime.get(i).put("AQI",Double.parseDouble(map1.get("AQI").toString()));
                if (Double.parseDouble(map1.get("AQI").toString())>=50){
                    String name = map1.get("maxSensor").toString();
                    dataAvbByMIdAndTime.get(i).put("首要污染物",name);
                }else {
                    dataAvbByMIdAndTime.get(i).put("首要污染物","-");
                }
            }
        }else {
            for (int i = 0; i <dataAvbByMIdAndTime.size() ; i++) {
                Map<String, Object> map =dataAvbByMIdAndTime.get(i);
                Map<String, Object> map1 = AQICalculation2.hourlyAQI(map);
                dataAvbByMIdAndTime.get(i).put("AQI",Double.parseDouble(map1.get("AQI").toString()));
                if (Double.parseDouble(map1.get("AQI").toString())>=50){
                    String name = map1.get("maxSensor").toString();
                    dataAvbByMIdAndTime.get(i).put("首要污染物",name);
                }else {
                    dataAvbByMIdAndTime.get(i).put("首要污染物","-");
                }
            }
        }
        Map<String, Object> dayAQI = AQICalculation2.dayAQI(dailyAvgData);
        dailyAvgData.put("首要污染物",dayAQI.get("maxSensor"));
        dailyAvgData.put("AQI",dayAQI.get("AQI"));
        dataAvbByMIdAndTime.add(dataAvbByMIdAndTime.size(),dailyAvgData);

        List<Map> finalList = new ArrayList<>();
        List<Map<String,Object>> finalList = new ArrayList<>();
        for (int i = 0; i <dataAvbByMIdAndTime.size() ; i++) {
            Map timeAndDate = new HashMap();
            if (i!=dataAvbByMIdAndTime.size()-1){
                String time = dataAvbByMIdAndTime.get(i).get("time").toString().substring(11,13);
                dataAvbByMIdAndTime.get(i).remove("time");
                timeAndDate.put("time",time);
                timeAndDate.put("data",dataAvbByMIdAndTime.get(i));
                finalList.add(timeAndDate);
            }else {
                String time = dataAvbByMIdAndTime.get(i).get("time").toString().substring(0,11);
                dataAvbByMIdAndTime.get(i).remove("time");
                timeAndDate.put("time",time);
                timeAndDate.put("data",dataAvbByMIdAndTime.get(i));
                finalList.add(timeAndDate);
            Map<String,Object> timeAndDate = new HashMap();
            String time = dataAvbByMIdAndTime.get(i).get("time").toString().substring(11,13);
            dataAvbByMIdAndTime.get(i).remove("time");
            timeAndDate.put("time",time);
            timeAndDate.put("data",dataAvbByMIdAndTime.get(i));
            finalList.add(timeAndDate);
        }
        Map<String,Object> timeAndDate = new HashMap();
        String time = startTime.substring(0,11);
        timeAndDate.put("time",time);
        if (dailyAvgData==null){
            //List<Map<String, Object>> dailyData = historyHourlyMapper.getDataAvbByMIdAndT;
            timeAndDate.put("data","");
        }else {
            timeAndDate.put("data",dailyAvgData);
        }

        finalList.add(timeAndDate);
        Map<String,Object> map = new HashMap<>();
        map.put("maxO3",maxO3);
        finalList.add(map);
        return finalList;
    }

    @Override
    public List<Map<String, Object>> getDataByMonitorPoints(String[] mIds, String startTime, String endTime) {
        List<Map<String, Object>> dataByMonitorPoints = historyHourlyMapper.getDataByMonitorPoints(mIds, startTime, endTime);
        List<Map> mapList = new ArrayList<>();
        for (Map<String, Object> dataByMonitorPoint : dataByMonitorPoints) {
            Map<String,String> map = new HashMap();
            String s = dataByMonitorPoint.get("O3").toString();
            Object time = dataByMonitorPoint.get("time");
            map.put("O3",s);
            map.put("time",time.toString());
            mapList.add(map);
        }
        List<List<Map<String,String>>> listArrayList = new ArrayList<>();
        if (mapList.size()>=8){
            List<Map<String,String>> mapList1 = new ArrayList<>();
            for (int i = 7; i <=mapList.size()-1 ; i++) {
                if (mapList.get(i).get("O3")!=null){
                    List<Integer> numList = new ArrayList();
                    Map<String,String> O3_8 = new HashMap<>();
                    for (int j =i; j<= mapList.size(); j--) {
                        if (j<0){
                            break;
                        }
                        numList.add(j);
                        if (numList.size()==8){
                            List e15 = new ArrayList();
                            for (int k = 0; k <numList.size() ; k++) {
                                String value = mapList.get(Integer.valueOf(numList.get(k))).get("O3").toString();
                                e15.add(value);
                            }
                            double sum =0;
                            for (Object o : e15) {
                                sum=sum+Double.parseDouble(o.toString());
                            }
                            Double avg1 = sum/e15.size();
                            int timeOfHour = numList.get(0);
                            if (timeOfHour==23){
                                timeOfHour=0;
                            }else {
                                timeOfHour=timeOfHour+1;
                            }
                            O3_8.put("time", String.valueOf(timeOfHour));
                            O3_8.put("O3_8h", String.valueOf(avg1));
                            mapList1.add(O3_8);
                        }else {
                            continue;
                        }
                    }
                }
                listArrayList.add(mapList1);
            }
        }
        Double maxO3=0.0;
        if(listArrayList.size()>0){
            List<Map<String, String>> mapList1 = listArrayList.get(0);
            List<Double> O3List = new ArrayList();
            for (Map<String, String> stringStringMap : mapList1) {
                O3List.add(Double.parseDouble(stringStringMap.get("O3_8h")));
            }
            maxO3 = Collections.max(O3List);
            for (int i = 0; i <dataByMonitorPoints.size() ; i++) {
                dataByMonitorPoints.get(i).put("O3_8h","");
                int time = Integer.parseInt(((Object)dataByMonitorPoints.get(i).get("time")).toString().substring(11,13)) ;
                for (int j = 0; j <mapList1.size() ; j++) {
                    int time1 = Integer.parseInt(mapList1.get(j).get("time").toString()) ;
                    if (time==time1){
                        Double O3_8h = Double.parseDouble(mapList1.get(j).get("O3_8h").toString());
                        dataByMonitorPoints.get(i).put("O3_8h",new BigDecimal(O3_8h).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
                    }
                }
            }
        }

        List<Map<String,Object>> finalList = new ArrayList<>();
        for (int i = 0; i <dataByMonitorPoints.size() ; i++) {
            Map<String,Object> timeAndDate = new HashMap();
            String time = dataByMonitorPoints.get(i).get("time").toString().substring(11,13);
            dataByMonitorPoints.get(i).remove("time");
            timeAndDate.put("time",time);
            timeAndDate.put("data",dataByMonitorPoints.get(i));
            finalList.add(timeAndDate);
        }
        Map<String, Object> dailyAvgData = historyMapper.getDailyAvgDataByMIds(mIds, startTime);
        if (dailyAvgData!=null){
            Map<String,Object> timeAndDate = new HashMap();
            dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
            timeAndDate.put("data",dailyAvgData);
            timeAndDate.put("time",startTime.substring(0,11));
            finalList.add(timeAndDate);
        }else {
            Map<String, Object> avgDataByMIds = historyHourlyMapper.getAvgDataByMIds(mIds, startTime, endTime);
            Map<String,Object> timeAndDate = new HashMap();
            avgDataByMIds.put("maxO3_8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
            timeAndDate.put("data",avgDataByMIds);
            timeAndDate.put("time",startTime.substring(0,11));
            finalList.add(timeAndDate);
        }
        for (int i=0;i<finalList.size();i++) {
            if (i!=finalList.size()-1){
                Map<String, Object> map1 = AQICalculation2.hourlyAQI((Map<String, Object>) finalList.get(i).get("data"));
                if (Double.parseDouble(map1.get("AQI").toString())>=50.0){
                    ((Map<String, Object>) finalList.get(i).get("data")).put("primary_pollutants",map1.get("maxSensor"));
                    ((Map<String, Object>) finalList.get(i).get("data")).put("AQI",map1.get("AQI"));
                }else {
                    ((Map<String, Object>) finalList.get(i).get("data")).put("primary_pollutants","-");
                    ((Map<String, Object>) finalList.get(i).get("data")).put("AQI",map1.get("AQI"));
                }
            }else {
                Map<String, Object> map1 = AQICalculation2.dayAQI((Map<String, Object>) finalList.get(i).get("data"));
                if (Double.parseDouble(map1.get("AQI").toString())>=50.0){
                    ((Map<String, Object>) finalList.get(i).get("data")).put("primary_pollutants",map1.get("maxSensor"));
                    ((Map<String, Object>) finalList.get(i).get("data")).put("AQI",map1.get("AQI"));
                }else {
                    ((Map<String, Object>) finalList.get(i).get("data")).put("primary_pollutants","-");
                    ((Map<String, Object>) finalList.get(i).get("data")).put("AQI",map1.get("AQI"));
                }
            }
        }
        Map<String,Object> timeAndDate = new HashMap();
        String time = startTime.substring(0,11);
        timeAndDate.put("time",time);
        if (dailyAvgData==null){
            timeAndDate.put("data","");
        }else {
            timeAndDate.put("data",dailyAvgData);
        }
        return finalList;
    }

    @Override
    public Map<String, Object> getAvgDataByMId(String mId, String startTime, String endTime) {
        return historyHourlyMapper.getAvgDataByMId(mId,startTime,endTime);
    }

    @Override
    public Point getDirPoint(Map<String, Object> parameters) throws Exception {
        Map<String, Object> pollutionSourceData = getPollutionSourceDataByHour(parameters);
        if (MapUtils.isEmpty(pollutionSourceData)) {

 src/main/java/com/moral/util/AQICalculation2.java

@@ -11,7 +11,7 @@
            String key = entry.getKey();
            if (entry.getValue() instanceof Double){
                Double value = Double.parseDouble(entry.getValue().toString());
                if (key!="O3-8h"){
                if (key!="O3_8h"){
                    maxMap.put(key,value);
                }
                Double PM2_5AQI;
@@ -30,13 +30,13 @@
                    case "SO2":SO2AQI = SO2AQI(value);
                        AQIList.add(SO2AQI);
                        break;
                    case "e16":NO2AQI = NO2AQI(value);
                    case "NO2":NO2AQI = NO2AQI(value);
                        AQIList.add(NO2AQI);
                        break;
                    case "CO":COAQI = COAQI(value);
                        AQIList.add(COAQI);
                        break;
                    case "O3":O3AQI = O3AQI(value);
                    case "maxO3_8h":O3AQI = O3AQI(value);
                        AQIList.add(O3AQI);
                        break;

@@ -50,11 +50,10 @@

        Double AQIMAX = Collections.max(AQIList);
        Map<String, Object> returnMap = new HashMap<>();
        //System.out.println("-------"+maxMap);

        Optional<Map.Entry<String, Integer>> max0 = maxMap.entrySet()
                .stream()
                .max(Map.Entry.comparingByValue());
        //System.out.println("-------"+max0.get().getKey());

        returnMap.put("maxSensor",max0.get().getKey());
        returnMap.put("AQI", AQIMAX);
@@ -67,7 +66,7 @@
            String key = entry.getKey();
            if (entry.getValue() instanceof Double){
                Double value = Double.parseDouble(entry.getValue().toString());
                if (key!="O3-day"){
                if (key!="O3_day"){
                    maxMap.put(key,value);
                }
                Double PM2_5AQI;
@@ -86,13 +85,13 @@
                    case "SO2":SO2AQI = SO2DayAQI(value);
                        AQIList.add(SO2AQI);
                        break;
                    case "e16":NO2AQI = NO2DayAQI(value);
                    case "NO2":NO2AQI = NO2DayAQI(value);
                        AQIList.add(NO2AQI);
                        break;
                    case "CO":COAQI = CODayAQI(value);
                        AQIList.add(COAQI);
                        break;
                    case "O3":maxO38hAQI = O3DayAQI(value);
                    case "maxO3_8h":maxO38hAQI = O3DayAQI(value);
                        AQIList.add(maxO38hAQI);
                        break;
                    default:
@@ -105,11 +104,9 @@

        Double AQIMAX = Collections.max(AQIList);
        Map<String, Object> returnMap = new HashMap<>();
        System.out.println("-------"+maxMap);
        Optional<Map.Entry<String, Integer>> max0 = maxMap.entrySet()
                .stream()
                .max(Map.Entry.comparingByValue());
        //System.out.println("-------"+max0.get().getKey());

        returnMap.put("maxSensor",max0.get().getKey());
        returnMap.put("AQI", AQIMAX);

 src/main/resources/mapper/HistoryHourlyMapper.xml

@@ -117,4 +117,32 @@
            from monitor_point mt,device d,history_hourly hh
            where mt.id=d.monitor_point_id and d.mac=hh.mac and mt.id=#{mId} and hh.time>#{startTime} and hh.time<![CDATA[<=]]>#{endTime} GROUP BY hh.time;
    </select>
    <select id="getDataByMonitorPoints" resultType="java.util.Map">
        select hh.time as `time`,
        AVG(hh.json->"$.e1[0]") as `PM2_5`,AVG(hh.json->"$.e2[0]") as 'PM10',AVG(hh.json->"$.e10[0]") as 'CO',
        AVG(hh.json->"$.e11[0]") as 'SO2',AVG(hh.json->"$.e16[0]") as 'NO2',AVG(hh.json->"$.e15[0]") as 'O3'
        from monitor_point mt,device d,history_hourly hh
        where mt.id=d.monitor_point_id and d.mac=hh.mac and mt.id in
        <foreach collection="mIds" item="id" index="index" open="(" close=")" separator=",">
            #{id}
        </foreach>
        and hh.time>#{startTime} and hh.time<![CDATA[<=]]>#{endTime} GROUP BY hh.time;
    </select>
    <select id="getAvgDataByMId" resultType="java.util.Map">
        SELECT AVG(hh.json->"$.e1[0]") as `PM2_5`,AVG(hh.json->"$.e2[0]") as 'PM10',AVG(hh.json->"$.e10[0]") as 'CO',
        AVG(hh.json->"$.e11[0]") as 'SO2',AVG(hh.json->"$.e16[0]") as 'NO2',AVG(hh.json->"$.e15[0]") as 'O3_day'
        from monitor_point mt,device d,history_hourly hh where mt.id=d.monitor_point_id
        and d.mac=hh.mac and mt.id =#{mId} and hh.time<![CDATA[<=]]>#{endTime} and hh.time>#{startTime}
    </select>
    <select id="getAvgDataByMIds" resultType="java.util.Map">
        SELECT AVG(hh.json->"$.e1[0]") as `PM2_5`,AVG(hh.json->"$.e2[0]") as 'PM10',AVG(hh.json->"$.e10[0]") as 'CO',
        AVG(hh.json->"$.e11[0]") as 'SO2',AVG(hh.json->"$.e16[0]") as 'NO2',AVG(hh.json->"$.e15[0]") as 'O3_day'
        from monitor_point mt,device d,history_hourly hh where mt.id=d.monitor_point_id
        and d.mac=hh.mac and mt.id in
        <foreach collection="mIds" item="id" index="index" open="(" close=")" separator=",">
            #{id}
        </foreach>
        and hh.time<![CDATA[<=]]>#{endTime} and hh.time>#{startTime}

    </select>
</mapper>

 src/main/resources/mapper/HistoryMapper.xml

@@ -303,8 +303,17 @@
    <select id="getDailyAvgData" resultType="java.util.Map">

        SELECT  AVG(hd.json->"$.e1[0]") as `PM2_5`,AVG(hd.json->"$.e2[0]") as 'PM10',AVG(hd.json->"$.e10[0]") as 'CO',

            AVG(hd.json->"$.e11[0]") as 'SO2',AVG(hd.json->"$.e16[0]") as 'NO2',AVG(hd.json->"$.e15[0]") as 'O3_day'

FROM `history_daily` hd,monitor_point mt,device d where mt.id=d.monitor_point_id

and d.mac=hd.mac and mt.id=#{mId} and time=#{time}

            FROM `history_daily` hd,monitor_point mt,device d where mt.id=d.monitor_point_id

            and d.mac=hd.mac and mt.id=#{mId} and time=#{time}

    </select>



    <select id="getDailyAvgDataByMIds" resultType="java.util.Map">

        SELECT  AVG(hd.json->"$.e1[0]") as `PM2_5`,AVG(hd.json->"$.e2[0]") as 'PM10',AVG(hd.json->"$.e10[0]") as 'CO',

            AVG(hd.json->"$.e11[0]") as 'SO2',AVG(hd.json->"$.e16[0]") as 'NO2',AVG(hd.json->"$.e15[0]") as 'O3_day'

            FROM `history_daily` hd,monitor_point mt,device d where mt.id=d.monitor_point_id

            and d.mac=hd.mac and mt.id in

        <foreach collection="mIds" item="id" index="index" open="(" close=")" separator=",">

            #{id}

        </foreach>

             and time=#{time}

    </select>

</mapper>