fix:升级语句优化

cjl

2023-09-12 ea1373d4e1511b620bb87872e692643e2edb81f8

 screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java

@@ -1,19 +1,25 @@
package com.moral.api.service.impl;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.*;
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.HistoryMonthlyMapper;
import com.moral.api.pojo.dto.dataDisplay.MonitorPointDataDisplayDTO;
import com.moral.api.pojo.dto.dataDisplay.SensorComparisonDisplayDTO;
import com.moral.api.pojo.form.dataDisplay.MonitorPointDataDisplayForm;
import com.moral.api.pojo.form.dataDisplay.SensorComparisonDisplayForm;
import com.moral.api.service.*;
import com.moral.constant.Constants;
import com.moral.pojo.AQI;
import com.moral.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import java.util.*;

import static com.moral.util.DateUtils.dateToDateString;

/**
 * @ClassName DataDisplayServiceImpl
@@ -32,23 +38,33 @@
    @Autowired
    HistoryHourlyService historyHourlyService;
    @Autowired
    HistoryMonthlyMapper historyMonthlyMapper;
    @Autowired
    HistoryWeeklyService historyWeeklyService;
    @Autowired
    HistoryMonthlyService historyMonthlyService;

    @Autowired
    DeviceMapper deviceMapper;

    @Override
    public List<MonitorPointDataDisplayDTO> getMonitorPointDisplayData(MonitorPointDataDisplayForm form) {
        //取参
        Integer monitorPointId = form.getMonitorPointId();
//        Integer monitorPointId = form.getMacs();
        List<String> macs = form.getMacs();
        String reportType = form.getReportType();
        Date startTime = form.getStartTime();
        Date endTime = form.getEndTime();
        //根据站点id获取站点下所有的设备
        List<Device> devices = deviceService.getDevicesByMonitorPointId(monitorPointId);
//        List<Device> devices = deviceService.getDevicesByMonitorPointId(monitorPointId);
        QueryWrapper<Device> deviceQueryWrapper = new QueryWrapper<>();
        deviceQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
        deviceQueryWrapper.in("mac", macs);
        List<Device> devices = deviceMapper.selectList(deviceQueryWrapper);
        Map<String, Device> deviceMap = new HashMap<>();
        List<String> macs = new ArrayList<>();
//        List<String> ListMacs = new ArrayList<>();
        devices.forEach(value -> {
            macs.add(value.getMac());
//            ListMacs.add(value.getMac());
            deviceMap.put(value.getMac(), value);
        });
        List<MonitorPointDataDisplayDTO> dtos = new ArrayList<>();
@@ -68,42 +84,56 @@
        }
        //处理小时报表请求，默认取上一个小时的值
        else if (reportType.equals(Constants.HOURLY_REPORT)) {
            Map<String, HistoryHourly> macDataMap = new HashMap<>();
            Map<String, List<HistoryHourly>> macDataMap = new HashMap<>();
            //获取数据
            macs.forEach(value -> {
                List<HistoryHourly> datas = historyHourlyService.getValueByMacAndTime(value, startTime, startTime);
                List<HistoryHourly> datas = historyHourlyService.getValueByMacAndTime(value, startTime, endTime);
                if (datas.size() != 0)
                    macDataMap.put(value, datas.get(0));
                    macDataMap.put(value,datas);
            });
            if (macDataMap.size() != 0)
                dtos = calculateReportData(macDataMap, deviceMap, startTime);
                dtos = calculateReportData(macDataMap, deviceMap, reportType, startTime);
        }
        //处理日报请求，默认获取昨天的值
        else if (reportType.equals(Constants.DAILY_REPORT)) {
            Map<String, List<HistoryDaily>> macDataMap = new HashMap<>();
            //获取数据
            Map<String, HistoryDaily> macDataMap = historyDailyService.getHistoryDailyByMacsAndDate(macs, startTime);
            macs.forEach(value -> {
                List<HistoryDaily> datas = historyDailyService.getHistoryDailyByMacAndTimeSlot(value, startTime, endTime);
                if (datas.size() != 0)
                    macDataMap.put(value,datas);
            });

            if (macDataMap.size() != 0)
                dtos = calculateReportData(macDataMap, deviceMap, startTime);
                dtos = calculateReportData(macDataMap, deviceMap, reportType, startTime);
        }
        //处理周报请求，默认获取上周的值
        else if (reportType.equals(Constants.WEEKLY_REPORT)) {
            //获取数据
            Map<String, HistoryWeekly> macDataMap = historyWeeklyService.getHistoryWeeklyByMacsAndDate(macs, startTime);
            if (macDataMap.size() != 0)
                dtos = calculateReportData(macDataMap, deviceMap, startTime, endTime);
                dtos = calculateReportData(macDataMap, deviceMap, reportType, startTime, endTime);
        }
        //处理月报请求
        else if (reportType.equals(Constants.MONTHLY_REPORT)) {
            //月报需要获取一个月每天的数据用来算综合指数，其他数据从月表中取出
            Map<String, List<HistoryDaily>> macDataDailyMap = new HashMap<>();
            Map<String, HistoryMonthly> macDataMonthlyMap = historyMonthlyService.getHistoryMonthlyByMacsAndDate(macs, startTime);
            Map<String, List<HistoryMonthly>> macDataMonthlyMap = new HashMap<>();
            macs.forEach(mac -> {
                QueryWrapper<HistoryMonthly> wrapper = new QueryWrapper<>();
                wrapper.eq("mac",mac);
                wrapper.between("time",startTime,endTime);
                List<HistoryMonthly> monthlyList = historyMonthlyMapper.selectList(wrapper);
                if (!ObjectUtils.isEmpty(monthlyList))
                    macDataMonthlyMap.put(mac, monthlyList);
            });
            macs.forEach(mac -> {
                List<HistoryDaily> dailyDatas = historyDailyService.getHistoryDailyByMacAndTimeSlot(mac, startTime, endTime);
                if (!ObjectUtils.isEmpty(dailyDatas))
                    macDataDailyMap.put(mac, dailyDatas);
            });
            if (macDataMonthlyMap.size() != 0)
                dtos = calculateReportData(macDataMonthlyMap, deviceMap, startTime);
                dtos = calculateReportData(macDataMonthlyMap, deviceMap, reportType, startTime);
            //注入综合指数
            injectComprehensiveIndex(dtos, macDataDailyMap);
        }
@@ -173,7 +203,7 @@
            dto.setSensorCode(sensor);
            timeValueMap.forEach((time, valueJson) -> {
                Map<String, Object> listMap = new HashMap<>();
                //如果对应时间没有数据
                //如果对应时间没有数据，则放入空
                if (valueJson == null) {
                    listMap.put("time", time);
                    listMap.put("value", "");
@@ -182,7 +212,7 @@
                }
                Map<String, Object> valueMap = JSON.parseObject(valueJson, Map.class);
                Object sensorValueObject = valueMap.get(sensor);
                //如果数据中没有该因子，则放入null
                //如果数据中没有该因子，则放入空
                if (sensorValueObject == null) {
                    listMap.put("time", time);
                    listMap.put("value", "");
@@ -191,6 +221,7 @@
                }
                //如果是小时数据需要判断标记位
                if (reportType.equals(Constants.DAILY_REPORT)) {
                    //如果标记位不为N，则放入空
                    if (!Constants.NORMAL_FLAG.equals(valueMap.get(sensor + "-Flag"))) {
                        listMap.put("time", time);
                        listMap.put("value", "");
@@ -211,6 +242,154 @@
        return dtos;
    }

    @Override
    public List<SensorComparisonDisplayDTO> getSensorComparisonDisplayDataV2(Map<String, Object> params) {
        //取参
        List<String> sensors = (List<String>) params.get("sensorCodes");
        /*Date startDate = form.getStartDate();
        Date endDate = form.getEndDate();*/
        //所选时间
        List<String> times = (List<String>) params.get("times");
        String startTime = times.get(0);
        String endTime = times.get(1);
        String mac = params.get("mac").toString();
        String reportType = params.get("reportType").toString();
        Map<String, String> timeValueMap = new LinkedHashMap<>();//key为time，value为数据的json
        //处理月数据
        if (reportType.equals(Constants.MONTHLY_REPORT)) {
            Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_EN);
            Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_EN);
            //List<HistoryHourly> hourlies = historyHourlyService.getValueByMacAndTime(mac, startDate, endDate);
            QueryWrapper<HistoryMonthly> historyMonthlyQueryWrapper = new QueryWrapper<>();
            historyMonthlyQueryWrapper.eq("mac",mac);
            historyMonthlyQueryWrapper.between("time",startTime.substring(0,7)+"-01 00:00:00",endTime.substring(0,7)+"-01 00:00:00");
            List<HistoryMonthly> monthlies = historyMonthlyMapper.selectList(historyMonthlyQueryWrapper);
            for (HistoryMonthly historyMonthly : monthlies) {
                Date time = historyMonthly.getTime();
                String dateStr = DateUtils.dateToDateString(time, "yyyy-MM");
                String value = historyMonthly.getValue();
                timeValueMap.put(dateStr, value);
            }
            //补上无数据时间
            Date middleDate = startDate;
            while (DateUtils.compareDateStr(DateUtils.dateToDateString(endDate,DateUtils.yyyy_MM_EN),DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_EN),DateUtils.yyyy_MM_EN)<=0){
                if (timeValueMap.get(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_EN)) == null)
                    timeValueMap.put(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_EN), null);
                middleDate = DateUtils.addMonths(middleDate,1);
            }
        }
        //处理小时数据
        else if (reportType.equals(Constants.HOURLY_REPORT)) {
            Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_EN);
            Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_EN);
            List<HistoryHourly> hourlies = historyHourlyService.getValueByMacAndTime(mac, startDate, endDate);
            for (HistoryHourly historyHourly : hourlies) {
                Date time = historyHourly.getTime();
                String dateStr = DateUtils.dateToDateString(time, "yyyy-MM-dd HH");
                String value = historyHourly.getValue();
                timeValueMap.put(dateStr, value);
            }
            //补上无数据时间
            Date middleDate = startDate;
            while (DateUtils.compareDateStr(DateUtils.dateToDateString(endDate,DateUtils.yyyy_MM_dd_HH_EN),DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN),DateUtils.yyyy_MM_dd_HH_EN)<=0){
                if (timeValueMap.get(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN)) == null)
                    timeValueMap.put(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN), null);
                middleDate = DateUtils.addHours(middleDate,1);
            }
        }
        //处理日数据
        else if (reportType.equals(Constants.DAILY_REPORT)) {
            Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_EN);
            Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_EN);
            List<HistoryDaily> dailies = historyDailyService.getHistoryDailyByMacAndTimeSlot(mac, startDate, endDate);
            for (HistoryDaily historyDaily : dailies) {
                Date time = historyDaily.getTime();
                String dateStr = DateUtils.dateToDateString(time, "yyyy-MM-dd");
                String value = historyDaily.getValue();
                timeValueMap.put(String.valueOf(dateStr), value);
            }
            //补上无数据时间
            Date middleDate = startDate;
            while (DateUtils.compareDateStr(DateUtils.dateToDateString(endDate,DateUtils.yyyy_MM_dd_EN),DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_EN),DateUtils.yyyy_MM_dd_EN)<=0){
                if (timeValueMap.get(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_EN)) == null)
                    timeValueMap.put(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_EN), null);
                middleDate = DateUtils.addDays(middleDate,1);
            }
        } else
            return null;
        //时间排序
        //timeValueMap = sortMapByTime(timeValueMap, reportType);
        //封装返回数据
        List<SensorComparisonDisplayDTO> dtos = new ArrayList<>();
        for (String sensor : sensors) {
            SensorComparisonDisplayDTO dto = new SensorComparisonDisplayDTO();
            List<Map<String, Object>> dtoTimeValueList = new ArrayList<>();
            if(sensor.equals("a00e12") || sensor.equals("a00e03")){
                dto.setCode("1");
            }else if (sensor.equals("a01006")){
                dto.setCode("2");
            }else if (sensor.equals("a99054") || sensor.equals("a21005")){
                dto.setCode("3");
            }else {
                dto.setCode("0");
            }
            dto.setSensorCode(sensor);
            timeValueMap.forEach((time, valueJson) -> {
                Map<String, Object> listMap = new HashMap<>();
                //如果对应时间没有数据，则放入空
                if (valueJson == null) {
                    listMap.put("time", time);
                    listMap.put("value", "");
                    dtoTimeValueList.add(listMap);
                    return;
                }
                Map<String, Object> valueMap = JSON.parseObject(valueJson, Map.class);
                Object sensorValueObject = valueMap.get(sensor);
                //如果数据中没有该因子，则放入空
                if (sensorValueObject == null) {
                    listMap.put("time", time);
                    listMap.put("value", "");
                    dtoTimeValueList.add(listMap);
                    return;
                }
                //如果是小时数据需要判断标记位
                if (reportType.equals(Constants.HOURLY_REPORT)) {
                    //如果标记位不为N，则放入空
                    if (!Constants.NORMAL_FLAG.equals(valueMap.get(sensor + "-Flag"))) {
                        listMap.put("time", time);
                        listMap.put("value", "");
                        dtoTimeValueList.add(listMap);
                        return;
                    }
                }
                //取出数据
                Double sensorValue = Double.parseDouble(sensorValueObject.toString());
                //封装数据
                listMap.put("time", time);
                listMap.put("value", sensorValue);
                dtoTimeValueList.add(listMap);
            });
            Collections.sort(dtoTimeValueList, new Comparator<Map<String, Object>>() {
                public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                    String id1 = (String) o1.get("time");
                    String id2 = (String) o2.get("time");
                    return id1.compareTo(id2);
                }

            });
            dto.setTimeValueList(dtoTimeValueList);
            dtos.add(dto);
        }
        return dtos;
    }

    /**
     * @Description: 根据时间进行排序
     * @Param: [timeValueMap, reportType]
     * @return: java.util.Map<java.lang.String               ,               java.lang.String>
     * @Author: 陈凯裕
     * @Date: 2021/11/3
     */
    private Map<String, String> sortMapByTime(Map<String, String> timeValueMap, String reportType) {
        List<Map.Entry<String, String>> entries = new ArrayList(timeValueMap.entrySet());
        Collections.sort(entries, new Comparator<Map.Entry<String, String>>() {
@@ -258,7 +437,6 @@
            String endTime = DateUtils.dateToDateString(endDate, "yyyy-MM-dd");
            String time = startTime + " - " + endTime;
            //计算数据个数
            Double AQINum = 0d;
            Double PM25Num = 0d;
            Double PM10Num = 0d;
            Double SO2Num = 0d;
@@ -266,8 +444,7 @@
            Double CONum = 0d;
            Double O3Num = 0d;
            Double TVOCNum = 0d;
            //计算AQI,PM2.5,PM10,SO2,NO2,CO,O3,TVOC总值，
            Double AQISum = 0d;
            //计算PM2.5,PM10,SO2,NO2,CO,O3,TVOC总值，
            Double PM25Sum = 0d;
            Double PM10Sum = 0d;
            Double SO2Sum = 0d;
@@ -313,18 +490,6 @@
                    TVOCSum = MathUtils.add(TVOCSum, Double.valueOf(TVOC.toString()));
                    TVOCNum++;
                }
                //加AQI
                int aqi = AQIUtils.hourlyAqi(valueMap);
                if (aqi != 0) {
                    AQISum += Double.valueOf(aqi);
                    AQINum++;
                }
            }
            //计算aqi均值
            if (AQINum != 0d) {
                Double AQID = AmendUtils.sciCal(AQISum / AQINum, 0);
                int AQIAvg = new Double(AQID).intValue();
                dto.setAQI(AQIAvg);
            }
            //计算PM2.5均值
            if (PM25Num != 0d) {
@@ -366,6 +531,16 @@
                Double TVOCAvg = AmendUtils.sciCal(TVOCSum / TVOCNum, 2);
                dto.setA99054(TVOCAvg);
            }
            //计算AQI
            Map<String,Object> sixParamMap = new HashMap<>();
            sixParamMap.put("a05024",dto.getA05024());
            sixParamMap.put("a21004",dto.getA21004());
            sixParamMap.put("a21005",dto.getA21005());
            sixParamMap.put("a34002",dto.getA34002());
            sixParamMap.put("a34004",dto.getA34004());
            sixParamMap.put("a21026",dto.getA21026());
            AQI aqi = AQIUtils.dailyAQI(sixParamMap);
            dto.setAQI(aqi.getAQIValue());
            dto.setDeviceName(deviceName);
            dto.setTime(time);
            dtos.add(dto);
@@ -381,37 +556,105 @@
     * @Author: 陈凯裕
     * @Date: 2021/9/28
     */
    private <T> List<MonitorPointDataDisplayDTO> calculateReportData(Map<String, T> macDataMap, Map<String, Device> deviceMap, Date... date) {
    private <T> List<MonitorPointDataDisplayDTO> calculateReportData(Map<String, T> macDataMap, Map<String, Device> deviceMap, String reportType, Date... date) {
        List<MonitorPointDataDisplayDTO> dtos = new ArrayList<>();
        macDataMap.forEach((key, valueObject) -> {
            MonitorPointDataDisplayDTO dto = new MonitorPointDataDisplayDTO();
            dto.setMac(key);
            //数据的map
            Map<String, Object> valueMap;
            //获取对象的value属性值
            Object valueO = ClassUtils.getPropertyValue(valueObject, "value");
            if (valueO == null)
                return;
            String value = (String) valueO;
            valueMap = JSON.parseObject(value, Map.class);
        Set<String> strings = macDataMap.keySet();
        for (String key : strings) {
            if (reportType.equals("0")){
                List<HistoryHourly> t = (List<HistoryHourly>)macDataMap.get(key);
                for (HistoryHourly historyHourly : t) {
                    MonitorPointDataDisplayDTO dto = new MonitorPointDataDisplayDTO();
                    String value = historyHourly.getValue();
                    Map map = JSON.parseObject(value, Map.class);
                    String time = DateUtils.dateToDateString(historyHourly.getTime(), "yyyy-MM-dd HH:00:00");
                    injectDataToDto(map, false, dto, reportType);
                    dto.setTime(time);
                    dto.setMac(key);
                    dto.setDeviceName(deviceMap.get(key).getName());
                    dtos.add(dto);
                }
            }
            if (reportType.equals("1")){
                List<HistoryDaily> t = (List<HistoryDaily>)macDataMap.get(key);
                for (HistoryDaily historyDaily : t) {
                    MonitorPointDataDisplayDTO dto = new MonitorPointDataDisplayDTO();
                    String value = historyDaily.getValue();
                    Map map = JSON.parseObject(value, Map.class);
                    String time = DateUtils.dateToDateString(historyDaily.getTime(), "yyyy-MM-dd");
                    injectDataToDto(map, false, dto, reportType);
                    dto.setTime(time);
                    dto.setMac(key);
                    dto.setDeviceName(deviceMap.get(key).getName());
                    dtos.add(dto);
                }

            }
            if (reportType.equals("2")){
                HistoryWeekly historyWeekly = (HistoryWeekly)macDataMap.get(key);
                    MonitorPointDataDisplayDTO dto = new MonitorPointDataDisplayDTO();
                    String value = historyWeekly.getValue();
                    Map map = JSON.parseObject(value, Map.class);
                    String time = DateUtils.dateToDateString(historyWeekly.getTime(), "yyyy-MM-dd");
                    injectDataToDto(map, false, dto, reportType);
                    dto.setTime(time);
                    dto.setMac(key);
                    dto.setDeviceName(deviceMap.get(key).getName());
                    dtos.add(dto);

            }
            if (reportType.equals("3")){
                List<HistoryMonthly> t = (List<HistoryMonthly>)macDataMap.get(key);
                for (HistoryMonthly historyMonthly : t) {
                    MonitorPointDataDisplayDTO dto = new MonitorPointDataDisplayDTO();
                    String value = historyMonthly.getValue();
                    Map map = JSON.parseObject(value, Map.class);
                    String time = DateUtils.dateToDateString(historyMonthly.getTime(), "yyyy-MM");
                    injectDataToDto(map, false, dto, reportType);
                    dto.setTime(time);
                    dto.setMac(key);
                    dto.setDeviceName(deviceMap.get(key).getName());
                    dtos.add(dto);
                }
            }
        }

//        macDataMap.forEach((key, valueObject) -> {
//            MonitorPointDataDisplayDTO dto = new MonitorPointDataDisplayDTO();
//            dto.setMac(key);
//            //数据的map
//            Map<String, Object> valueMap;
//            List<Map<String, Object>> list;
//            //获取对象的value属性值
//            Object valueO = ClassUtils.getPropertyValue(valueObject, "value");
//            if (valueO == null)
//                return;
//            String value = (String) valueO;
//            list = JSON.parseObject(value, List.class);
//            for (Map<String, Object> map : list) {
//                String o = map.get("value").toString();
//                valueMap = JSON.parseObject(o, Map.class);
//                injectDataToDto(valueMap, false, dto, reportType);
//                String deviceName = deviceMap.get(key).getName();
//                dto.setDeviceName(deviceName);
//                String startTime = DateUtils.dateToDateString((Date) map.get("time"), "yyyy-MM-dd HH:mm:ss");
//                dto.setTime(startTime);
//                dtos.add(dto);
//            }
            //获取设备名称
            String deviceName = deviceMap.get(key).getName();
            dto.setDeviceName(deviceName);

            //拼接时间,时报的时间需要精确到小时，日报精确到当天，周报需要含有开始和结束时间
            String startTime = "";
            if (valueObject instanceof HistoryHourly && date.length == 1)
                startTime = DateUtils.dateToDateString(date[0], "yyyy-MM-dd HH:mm:ss");
            else if (valueObject instanceof HistoryDaily && date.length == 1)
                startTime = DateUtils.dateToDateString(date[0], "yyyy-MM-dd");
            else if (valueObject instanceof HistoryWeekly && date.length == 2)
                startTime = DateUtils.dateToDateString(date[0], "yyyy-MM-dd") + " -- " + DateUtils.dateToDateString(date[1], "yyyy-MM-dd");
            else if (valueObject instanceof HistoryMonthly && date.length == 1)
                startTime = DateUtils.dateToDateString(date[0], "yyyy-MM");
            dto.setTime(startTime);
//            String startTime = "";
//            if (valueObject instanceof HistoryHourly && date.length == 1)
//                startTime = DateUtils.dateToDateString(date[0], "yyyy-MM-dd HH:mm:ss");
//            else if (valueObject instanceof HistoryDaily && date.length == 1)
//                startTime = DateUtils.dateToDateString(date[0], "yyyy-MM-dd");
//            else if (valueObject instanceof HistoryWeekly && date.length == 2)
//                startTime = DateUtils.dateToDateString(date[0], "yyyy-MM-dd") + " -- " + DateUtils.dateToDateString(date[1], "yyyy-MM-dd");
//            else if (valueObject instanceof HistoryMonthly && date.length == 1)
//                startTime = DateUtils.dateToDateString(date[0], "yyyy-MM");
//            dto.setTime(startTime);
            //注入数据
            injectDataToDto(valueMap, false, dto);
            dtos.add(dto);
        });
//        });
        return dtos;
    }

@@ -423,7 +666,7 @@
     * @Author: 陈凯裕
     * @Date: 2021/9/28
     */
    private void injectDataToDto(Map<String, Object> valueMap, boolean flag, MonitorPointDataDisplayDTO dto) {
    private void injectDataToDto(Map<String, Object> valueMap, boolean flag, MonitorPointDataDisplayDTO dto, String reportType) {
        //注入CO
        String COFlag = (String) valueMap.get("a21005-Flag");
        Object COObject = valueMap.get("a21005");
@@ -474,9 +717,13 @@
            dto.setA05024(new Double(AmendUtils.sciCal(O3, 0)).intValue());
        }
        //注入AQI
        int aqi = AQIUtils.hourlyAqi(valueMap);
        if (aqi != 0)
            dto.setAQI(aqi);
        Integer aqi;
        if (reportType.equals(Constants.HOURLY_REPORT)) {
            aqi = AQIUtils.hourlyAQI(valueMap).getAQIValue();
        } else {
            aqi = AQIUtils.dailyAQI(valueMap).getAQIValue();
        }
        dto.setAQI(aqi);
    }