fix:升级语句优化

cjl

2023-09-12 ea1373d4e1511b620bb87872e692643e2edb81f8

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

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

import com.alibaba.excel.util.StringUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.config.properties.SpecialCitiesProperties;
import com.moral.api.dto.CityAqiDailyListDTO;
import com.moral.api.entity.*;
import com.moral.api.mapper.CityAqiMapper;
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.ForecastMapper;
import com.moral.api.mapper.*;
import com.moral.api.pojo.dto.cityAQI.CityPollutionLevel;
import com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent;
import com.moral.api.pojo.form.aqi.AirQualityComparisonForm;
import com.moral.api.pojo.vo.cityAQI.AirQualityComparisonVO;
import com.moral.api.pojo.vo.cityAQI.CityAreaRangeVO;
import com.moral.api.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -25,12 +26,13 @@

import com.moral.util.MathUtils;

import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import java.text.DecimalFormat;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -49,6 +51,8 @@

    @Autowired
    private CityAqiMapper cityAqiMapper;
    @Autowired
    private CityAqiDailyMapper cityAqiDailyMapper;

    @Autowired
    private ForecastMapper forecastMapper;
@@ -82,6 +86,12 @@

    @Autowired
    private HistoryHourlyService historyHourlyService;

    @Autowired
    SpecialCitiesProperties citiesProperties;

    @Autowired
    private SysAreaMapper sysAreaMapper;

    @Override
    public List<Map<String, Object>> measuredCompareForecastOfO3(Map<String, Object> params) {
@@ -139,6 +149,34 @@
        return result;
    }


    @Override
    public List<Map<String, Object>> measuredCompareForecastOfO3_8H(Map<String, Object> params) {
        String regionCode = params.get("regionCode").toString();
        String time = params.get("time").toString();
        Date endTime = DateUtils.getDate(time+" "+"23:00:00",DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        Date startDate = DateUtils.getDate(time+" "+"00:00:00",DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        Date startTime = DateUtils.addHours(startDate,-7);
        //预测数据
        QueryWrapper<Forecast> forecastQueryWrapper = new QueryWrapper<>();
        forecastQueryWrapper.select("time", "value")
                .eq("city_code", regionCode)
        .between("time",startTime,endTime)
                .orderByAsc("time");
        List<Map<String, Object>> forecastData = forecastMapper.selectMaps(forecastQueryWrapper);
        //实测数据
        QueryWrapper<CityAqi> cityAqiQueryWrapper = new QueryWrapper<>();
        cityAqiQueryWrapper.select("time", "value")
                .eq("city_code", regionCode)
                .between("time",startTime,endTime).orderByAsc("time");
        List<Map<String, Object>> measuredData = cityAqiMapper.selectMaps(cityAqiQueryWrapper);

        List<Map<String, Object>> result = getO3_8H(forecastData,0,time);
        result.addAll(getO3_8H(measuredData,1,time));
        return result;
    }


    @Override
    public Map<String, Object> queryCityAqiByRegionCode(Integer regionCode) {
        Map<String, Object> value = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.CITY_AQI, String.valueOf(regionCode));
@@ -171,7 +209,7 @@
    @Override
    public Map<String, Object> query24HoursAqiByRegionCode(Integer regionCode) {
        //查询最新一条数据，用于获取最新的时间
        QueryWrapper<CityAqi> lastDataWrapper = new QueryWrapper<>();
        /*QueryWrapper<CityAqi> lastDataWrapper = new QueryWrapper<>();
        lastDataWrapper.eq("city_code", regionCode);
        lastDataWrapper.orderByDesc("time");
        lastDataWrapper.last(true, "limit 1");
@@ -184,39 +222,33 @@
        //查询数据
        QueryWrapper<CityAqi> wrapper = new QueryWrapper<>();
        wrapper.between("time", startDate, endDate);
        wrapper.eq("city_code", regionCode);
        List<CityAqi> cityAqis = cityAqiMapper.selectList(wrapper);
        wrapper.eq("city_code", regionCode);*/
        List<CityAqi> cityAqis = cityAqiMapper.listCity(regionCode);
        //如果数据不足24小时则补全
        if (cityAqis.size() != 24) {
            Map<Date, CityAqi> dateCityAqiMap = new HashMap<>();
            cityAqis.forEach(value -> dateCityAqiMap.put(value.getTime(), value));
        if(CollectionUtils.isEmpty(cityAqis)){
            return new HashMap<>();
        }
        Date startDate = cityAqis.get(0).getTime();
        if(cityAqis.size()<24){
            for (int i = 0; i < 24; i++) {
                Date date = DateUtils.addHours(startDate, i);
                CityAqi cityAqi1 = dateCityAqiMap.get(date);
                if (cityAqi1 == null) {
                Date dateTime = DateUtils.addHours(startDate, i);
                if(cityAqis.size()-1 <i){
                    CityAqi newCityAqi = new CityAqi();
                    newCityAqi.setTime(date);
                    newCityAqi.setTime(dateTime);
                    newCityAqi.setValue("0");
                    cityAqis.add(newCityAqi);
                    continue;
                }
            }
            //按照时间进行排序
            cityAqis.sort(Comparator.comparing(CityAqi::getTime));
        }
            //按照时间进行排序
        cityAqis.sort(Comparator.comparing(CityAqi::getTime));

        //封装返回数据,map的key为yyyy-MM-dd HH:mm格式的时间，value为aqi的数值
        Map<String, Object> result = new LinkedHashMap<>();
        for (CityAqi aqi : cityAqis) {
            String key = DateUtils.dateToDateString(aqi.getTime(), "yyyy-MM-dd HH:mm");
            String allDataJson = aqi.getValue();
            if (allDataJson == null) {
                result.put(key, "");
                continue;
            }
            Map<String, Object> allDataMap = JSON.parseObject(allDataJson, Map.class);
            Object aqiData = allDataMap.get("AQI");
            if (aqiData == null)
                result.put(key, "");
            else
                result.put(key, aqiData);
            result.put(key,aqi.getValue());
        }
        return result;
    }
@@ -454,32 +486,33 @@
        wrapper.select("city_code", "value")
                .eq("time", time)
                .in("city_code", regionCodes);
        List<Map<String, Object>> dayData = cityAqiDailyService.listMaps(wrapper);
        for (Map<String, Object> dayDatum : dayData) {
            Map<String, Object> value = JSONObject.parseObject((String) dayDatum.get("value"), Map.class);
            List<String> primaryPollutantNames = (List<String>) value.get("primaryPollutant");
        List<CityAqiDaily> dayData = cityAqiDailyService.list(wrapper);
        for (CityAqiDaily cityAqiDaily : dayData) {
            Map<String, Object> resultMap = JSONObject.parseObject(cityAqiDaily.getValue(), Map.class);
            resultMap.put("O3_8H", resultMap.remove("O3"));
            List<String> primaryPollutantNames = (List<String>) resultMap.get("primaryPollutant");
            String primaryPollutant = "";
            if (!ObjectUtils.isEmpty(primaryPollutantNames)) {
                primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));
            }
            value.put("primaryPollutant", primaryPollutant);
            resultMap.put("primaryPollutant", primaryPollutant);


            //城市名
            for (SysArea sysArea : sysAreas) {
                if (dayDatum.get("city_code").equals(sysArea.getAreaCode())) {
                    value.put("cityName", sysArea.getAreaName());
                if (cityAqiDaily.getCityCode().equals(sysArea.getAreaCode())) {
                    resultMap.put("cityName", sysArea.getAreaName());
                    break;
                }
            }
            result.add(value);
            result.add(resultMap);
        }
        return result;
    }

    /**
     * @param sysAreas 所要获取城市集合
     * @param time     所要获取数据的时间 2021-11-01 00:00:00 每月1号
     * @param time     所要获取数据的时间 2021-11-01 00:00:00
     * @return 功能：月排名
     */
    private List<Map<String, Object>> monthRank(List<SysArea> sysAreas, String time) {
@@ -487,123 +520,24 @@
                .map(SysArea::getAreaCode)
                .collect(Collectors.toList());

        //需要均值计算的因子
        List<String> sensors = Arrays.asList("PM2_5", "PM10", "SO2", "NO2");
        List<Map<String, Object>> result = new ArrayList<>();
        //如果部是本月,实时计算，其他直接从city_aqi_monthly获取
        if (!time.substring(0, 7).equals(DateUtils.dateToDateString(new Date(), DateUtils.yyyy_MM_EN))) {
            QueryWrapper<CityAqiMonthly> cityAqiMonthlyQueryWrapper = new QueryWrapper<>();
            for (Integer regionCode : regionCodes) {
                cityAqiMonthlyQueryWrapper.clear();
                cityAqiMonthlyQueryWrapper.select("value")
                        .eq("city_code", regionCode)
                        .eq("time", time);
                CityAqiMonthly cityAqiMonthly = cityAqiMonthlyService.getOne(cityAqiMonthlyQueryWrapper);
                if (cityAqiMonthly == null) {
                    continue;
                }
                String value = cityAqiMonthly.getValue();
                Map<String, Object> resultMap = JSONObject.parseObject(value, Map.class);


                //城市名
                for (SysArea sysArea : sysAreas) {
                    if (regionCode.equals(sysArea.getAreaCode())) {
                        resultMap.put("cityName", sysArea.getAreaName());
                        break;
                    }
                }
            }
            return result;
        }

        QueryWrapper<CityAqiDaily> cityAqiDailyQueryWrapper = new QueryWrapper<>();
        cityAqiDailyQueryWrapper.select("city_code", "value")
                .ge("time", time)
        QueryWrapper<CityAqiMonthly> cityAqiMonthlyQueryWrapper = new QueryWrapper<>();
        cityAqiMonthlyQueryWrapper.select("city_code", "value")
                .eq("time", time)
                .in("city_code", regionCodes);
        List<Map<String, Object>> thisMonthData = cityAqiDailyService.listMaps(cityAqiDailyQueryWrapper);
        //按city_code分组
        Map<Integer, List<Map<String, Object>>> thisMonthMap = thisMonthData.parallelStream()
                .collect(Collectors.groupingBy(o -> Integer.parseInt(o.get("city_code").toString())));

        thisMonthMap.forEach((cityCode, value) -> {
            Map<String, Object> resultMap = new HashMap<>();

            Map<String, Object> params = new HashMap<>();
            List<Map<String, Object>> temp = new ArrayList<>();
            for (Map<String, Object> map : value) {
                Map<String, Object> sensorsValue = JSONObject.parseObject(map.get("value").toString(), Map.class);
                Map<String, Object> tempMap = new HashMap<>();
                tempMap.put(Constants.SENSOR_CODE_CO, sensorsValue.get("CO"));
                tempMap.put(Constants.SENSOR_CODE_O3, sensorsValue.get("O3"));
                Map<String, Object> hashMap = new HashMap<>();
                hashMap.put("value", JSONObject.toJSONString(tempMap));
                temp.add(hashMap);
            }
            params.put("data", temp);
            //1. CO 95百分位计算并修约
            Map<String, Object> coAvgOfWeekOrMonth = AmendUtils.getCOAvgOfWeekOrMonth(params);
            if (!ObjectUtils.isEmpty(coAvgOfWeekOrMonth)) {
                resultMap.put("CO", coAvgOfWeekOrMonth.get(Constants.SENSOR_CODE_CO));
            }

            //2. O3 90百分位计算并修约
            Map<String, Object> o3AvgOfWeekOrMonth = AmendUtils.getO3AvgOfWeekOrMonth(params);
            if (!ObjectUtils.isEmpty(o3AvgOfWeekOrMonth)) {
                resultMap.put("O3", o3AvgOfWeekOrMonth.get(Constants.SENSOR_CODE_O3));
            }

            sensors.forEach(sensor -> {
                OptionalDouble optionalDouble = value.parallelStream().flatMapToDouble(v -> {
                    Map<String, Object> sensorValue = JSONObject.parseObject((String) v.get("value"), Map.class);
                    Object o = sensorValue.get(sensor);
                    if (ObjectUtils.isEmpty(o)) {
                        return null;
                    }
                    double aDouble = Double.parseDouble(o.toString());
                    return DoubleStream.of(aDouble);
                }).average();

                if (optionalDouble.isPresent()) {
                    //银行家算法修约
                    double sciCal = AmendUtils.sciCal(optionalDouble.getAsDouble(), 0);
                    resultMap.put(sensor, sciCal);
                }
            });

            //本月综指计算
            Double compositeIndex = ComprehensiveIndexUtils.dailyData(resultMap);
            resultMap.put("compositeIndex", compositeIndex);

            //前端O3用O3_8H显示
        List<CityAqiMonthly> list = cityAqiMonthlyService.list(cityAqiMonthlyQueryWrapper);
        for (CityAqiMonthly cityAqiMonthly : list) {
            Map<String, Object> resultMap = JSONObject.parseObject(cityAqiMonthly.getValue(), Map.class);
            resultMap.put("O3_8H", resultMap.remove("O3"));

            //本月综指同上月对比
            Date lastMonth = DateUtils.addMonths(DateUtils.getDate(time), -1);
            QueryWrapper<CityAqiMonthly> queryWrapper = new QueryWrapper<>();
            queryWrapper.select("value")
                    .eq("city_code", cityCode)
                    .eq("time", DateUtils.dateToDateString(lastMonth));
            //获取上月数据
            CityAqiMonthly lastCityAqiMonthly = cityAqiMonthlyService.getOne(queryWrapper);
            String monthContrast = "";
            if (lastCityAqiMonthly != null) {
                Map<String, Object> map = JSONObject.parseObject(lastCityAqiMonthly.getValue(), Map.class);
                double lastCompositeIndex = Double.parseDouble(map.get("compositeIndex").toString());
                DecimalFormat decimalFormat = new DecimalFormat("0.00%");
                monthContrast = decimalFormat.format((compositeIndex - lastCompositeIndex) / lastCompositeIndex);
            }
            resultMap.put("monthContrast", monthContrast);

            //城市名
            for (SysArea sysArea : sysAreas) {
                if (cityCode.equals(sysArea.getAreaCode())) {
                if (cityAqiMonthly.getCityCode().equals(sysArea.getAreaCode())) {
                    resultMap.put("cityName", sysArea.getAreaName());
                    break;
                }
            }
            result.add(resultMap);
        });
        }
        return result;
    }

@@ -617,124 +551,23 @@
                .map(SysArea::getAreaCode)
                .collect(Collectors.toList());

        //需要均值计算的因子
        List<String> sensors = Arrays.asList("PM2_5", "PM10", "SO2", "NO2");
        List<Map<String, Object>> result = new ArrayList<>();
        //如果是本月,实时计算，其他直接从city_aqi_monthly获取
        if (!time.substring(0, 4).equals(DateUtils.dateToDateString(new Date(), DateUtils.yyyy))) {
            QueryWrapper<CityAqiYearly> cityAqiYearlyQueryWrapper = new QueryWrapper<>();
            for (Integer regionCode : regionCodes) {
                cityAqiYearlyQueryWrapper.clear();
                cityAqiYearlyQueryWrapper.select("value")
                        .eq("city_code", regionCode)
                        .eq("time", time);
                CityAqiYearly cityAqiYearly = cityAqiYearlyService.getOne(cityAqiYearlyQueryWrapper);
                if (cityAqiYearly == null) {
                    continue;
                }
                String value = cityAqiYearly.getValue();
                Map<String, Object> resultMap = JSONObject.parseObject(value, Map.class);


                //城市名
                for (SysArea sysArea : sysAreas) {
                    if (regionCode.equals(sysArea.getAreaCode())) {
                        resultMap.put("cityName", sysArea.getAreaName());
                        break;
                    }
                }
                result.add(resultMap);
            }
            return result;
        }

        QueryWrapper<CityAqiDaily> cityAqiDailyQueryWrapper = new QueryWrapper<>();
        cityAqiDailyQueryWrapper.select("city_code", "value")
                .ge("time", time)
                .in("city_code", regionCodes);
        List<Map<String, Object>> thisMonthData = cityAqiDailyService.listMaps(cityAqiDailyQueryWrapper);
        //按city_code分组
        Map<Integer, List<Map<String, Object>>> thisYearMap = thisMonthData.parallelStream()
                .collect(Collectors.groupingBy(o -> Integer.parseInt(o.get("city_code").toString())));
        thisYearMap.forEach((cityCode, value) -> {
            Map<String, Object> resultMap = new HashMap<>();

            Map<String, Object> params = new HashMap<>();
            List<Map<String, Object>> temp = new ArrayList<>();
            for (Map<String, Object> map : value) {
                Map<String, Object> sensorsValue = JSONObject.parseObject(map.get("value").toString(), Map.class);
                Map<String, Object> tempMap = new HashMap<>();
                tempMap.put(Constants.SENSOR_CODE_CO, sensorsValue.get("CO"));
                tempMap.put(Constants.SENSOR_CODE_O3, sensorsValue.get("O3"));
                Map<String, Object> hashMap = new HashMap<>();
                hashMap.put("value", JSONObject.toJSONString(tempMap));
                temp.add(hashMap);
            }
            params.put("data", temp);
            //1. CO 95百分位计算并修约
            Map<String, Object> coAvgOfWeekOrMonth = AmendUtils.getCOAvgOfWeekOrMonth(params);
            if (!ObjectUtils.isEmpty(coAvgOfWeekOrMonth)) {
                resultMap.put("CO", coAvgOfWeekOrMonth.get(Constants.SENSOR_CODE_CO));
            }

            //2. O3 90百分位计算并修约
            Map<String, Object> o3AvgOfWeekOrMonth = AmendUtils.getO3AvgOfWeekOrMonth(params);
            if (!ObjectUtils.isEmpty(o3AvgOfWeekOrMonth)) {
                resultMap.put("O3", o3AvgOfWeekOrMonth.get(Constants.SENSOR_CODE_O3));
            }

            sensors.forEach(sensor -> {
                OptionalDouble optionalDouble = value.parallelStream().flatMapToDouble(v -> {
                    Map<String, Object> sensorValue = JSONObject.parseObject((String) v.get("value"), Map.class);
                    Object o = sensorValue.get(sensor);
                    if (ObjectUtils.isEmpty(o)) {
                        return null;
                    }
                    double aDouble = Double.parseDouble(o.toString());
                    return DoubleStream.of(aDouble);
                }).average();

                if (optionalDouble.isPresent()) {
                    //银行家算法修约
                    double sciCal = AmendUtils.sciCal(optionalDouble.getAsDouble(), 0);
                    resultMap.put(sensor, sciCal);
                }
            });

            //本年综指计算
            Double compositeIndex = ComprehensiveIndexUtils.dailyData(resultMap);
            resultMap.put("compositeIndex", compositeIndex);

            //前端O3用O3_8H显示
        QueryWrapper<CityAqiYearly> cityAqiYearlyQueryWrapper = new QueryWrapper<>();
        cityAqiYearlyQueryWrapper.select("city_code", "value")
                .in("city_code", regionCodes)
                .eq("time", time);
        List<CityAqiYearly> list = cityAqiYearlyService.list(cityAqiYearlyQueryWrapper);
        for (CityAqiYearly cityAqiYearly : list) {
            Map<String, Object> resultMap = JSONObject.parseObject(cityAqiYearly.getValue(), Map.class);
            resultMap.put("O3_8H", resultMap.remove("O3"));

            //本年综指同去年对比
            String lastYear = DateUtils.getDateAddYear(time.substring(0, 4), -1);
            QueryWrapper<CityAqiYearly> queryWrapper = new QueryWrapper<>();
            queryWrapper.select("value")
                    .eq("city_code", cityCode)
                    .eq("time", lastYear);
            //获取去年数据
            CityAqiYearly lastCityAqiYearly = cityAqiYearlyService.getOne(queryWrapper);
            String yearContrast = "";
            if (lastCityAqiYearly != null) {
                Map<String, Object> map = JSONObject.parseObject(lastCityAqiYearly.getValue(), Map.class);
                double lastCompositeIndex = Double.parseDouble(map.get("compositeIndex").toString());
                DecimalFormat decimalFormat = new DecimalFormat("0.00%");
                yearContrast = decimalFormat.format((compositeIndex - lastCompositeIndex) / lastCompositeIndex);
            }
            resultMap.put("yearContrast", yearContrast);


            //城市名
            for (SysArea sysArea : sysAreas) {
                if (cityCode.equals(sysArea.getAreaCode())) {
                if (cityAqiYearly.getCityCode().equals(sysArea.getAreaCode())) {
                    resultMap.put("cityName", sysArea.getAreaName());
                    break;
                }
            }
            result.add(resultMap);
        });
        }
        return result;
    }

@@ -854,13 +687,34 @@
        Date now = new Date();
        //昨日
        Date yesterday = DateUtils.dataToTimeStampTime(DateUtils.getDateOfDay(now, -1), DateUtils.yyyy_MM_dd_EN);
        String dateString = DateUtils.dateToDateString(yesterday, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        String dateString = DateUtils.dateToDateString(yesterday, DateUtils.yyyy_MM_dd_EN);

        String s = String.valueOf(regionCode);
        //获取省,市code
        Integer provinceCode = Integer.parseInt(s.substring(0, 2) + "0000");
        Integer cityCode = Integer.parseInt(s.substring(0, 4) + "00");
        //获取省内所有city_code
        Map<String,Object> params = new HashMap<>();
        params.put("cityCode",provinceCode);
        params.put("start",dateString);
        params.put("end",dateString);
        params.put("type",1);
        List<CityAqiDailyListDTO> dayList = cityAqiDailyMapper.CityAqiDailyMap(params);
        String start = DateUtils.dateToDateString(DateUtils.addMonths(DateUtils.getFirstDayOfLastMonth(), 1));
        params.put("start",start);
        params.put("type",2);
        List<CityAqiDailyListDTO> monList = cityAqiDailyMapper.CityAqiDailyMap(params);
        start =DateUtils.dateToDateString(now, DateUtils.yyyy);
        params.put("start",start);
        params.put("end",start);
        params.put("type",3);
        List<CityAqiDailyListDTO> yearList = cityAqiDailyMapper.CityAqiDailyMap(params);
        int indexDay = dayList.stream().map(CityAqiDailyListDTO::getCityCode).collect(Collectors.toList()).indexOf(cityCode.toString());
        int indexMon = monList.stream().map(CityAqiDailyListDTO::getCityCode).collect(Collectors.toList()).indexOf(cityCode.toString());
        int indexYear = yearList.stream().map(CityAqiDailyListDTO::getCityCode).collect(Collectors.toList()).indexOf(cityCode.toString());
        result.put("day",mapResult(dayList,indexDay));
        result.put("month",mapResult(monList,indexMon));
        result.put("year",mapResult(yearList,indexYear));
       /* //获取省内所有city_code
        QueryWrapper<SysArea> wrapper = new QueryWrapper<>();
        wrapper.select("area_code").eq("parent_code", provinceCode);
        List<Object> cityCodes = sysAreaService.listObjs(wrapper);
@@ -948,11 +802,19 @@
            yearMap.put("size", null);
        }
        yearMap.put("compositeIndex", yearMap.remove("value"));
        result.put("year", yearMap);
        result.put("year", yearMap);*/

        //时间，昨日
        result.put("time", DateUtils.dateToDateString(yesterday, DateUtils.yyyy_MM_dd_EN));
        return result;
    }

    private Map<String,Object> mapResult(List<CityAqiDailyListDTO> list, int length){
        Map<String,Object> map = new HashMap<>();
        map.put("AQI",CollectionUtils.isNotEmpty(list)&&length>0&&Objects.nonNull(list.get(length-1))?list.get(length-1).getAqi():0);
        map.put("rank",CollectionUtils.isNotEmpty(list)&&length>0?length:0);
        map.put("size",CollectionUtils.isNotEmpty(list)&&length>0?list.size():0);
        return map;
    }

    @Override
@@ -1007,11 +869,16 @@

    //环比数据
    @Override
    public List<Map<String, Object>> momData(Integer regionCode, Integer size, Integer current, Integer orgId) {
    public Map<String, Object> momData(Integer regionCode, Integer size, Integer current, Integer orgId) {
        Map<String,Object> result = new HashMap<>();
        Page<CityAqi> page = new Page<>(current, size);
        Page<CityAqi> pageNext = new Page<>(current+1, size);
        QueryWrapper<CityAqi> cityAqiQueryWrapper = new QueryWrapper<>();
        cityAqiQueryWrapper.eq("city_code",regionCode);
        Integer count = cityAqiMapper.selectCount(cityAqiQueryWrapper);
        if (count==0){
            return result;
        }
        cityAqiQueryWrapper.orderByDesc("time");
        Page<CityAqi> resultPage = cityAqiMapper.selectPage(page, cityAqiQueryWrapper);
        List<CityAqi> cityAqiList = resultPage.getRecords();
@@ -1019,7 +886,7 @@
        List<CityAqi> cityAqiListNext = resultPageNext.getRecords();
        List<Map<String,Object>> resultList = new ArrayList<>();
        if (cityAqiList.size()==0){
            return resultList;
            return result;
        }
        for (int i=0; i<cityAqiList.size(); i++) {
            Map<String,Object> resultMap = new HashMap<>();
@@ -1173,43 +1040,190 @@
                    }
                }
            }
            resultMap.put("time",time.substring(0,13));
            resultMap.put("title","【"+hour+"时数据提醒】");
            resultMap.put("info",hour+"时，我市AQI："+AQI+"，等级："+AQIIndex+"。与"+previousHour+"相比，PM10："+PM10+"微克/立方米，"+PM10_change+"；PM2_5："+PM2_5+"微克/立方米，"+PM2_5_change+"；TVOC总量："+TVOC+"毫克/立方米；O3："+O3+"微克/立方米，"+O3_change+"。");
            String PM2_5_string = subZeroAndDot(PM2_5.toString());
            String PM10_string = subZeroAndDot(PM10.toString());
            String O3_string = subZeroAndDot(O3.toString());
            String PM2_5_change_string = subZeroAndDot(PM2_5_change.toString());
            String PM10_change_string = subZeroAndDot(PM10_change.toString());
            String O3_change_string = subZeroAndDot(O3_change.toString());
            resultMap.put("info",hour+"时，我市AQI："+AQI+"，等级："+AQIIndex+"。与"+previousHour+"时相比，PM10："+PM10_string+"微克/立方米，"+PM10_change_string+"；PM2.5："+PM2_5_string+"微克/立方米，"+PM2_5_change_string+"；TVOC总量："+String.format("%.2f", TVOC)+"毫克/立方米；O3："+O3_string+"微克/立方米，"+O3_change_string+"。");
            QueryWrapper<CityWeather> cityWeatherQueryWrapper = new QueryWrapper<>();
            cityWeatherQueryWrapper.eq("city_code",regionCode);
            cityWeatherQueryWrapper.eq("time",cityAqiList.get(i).getTime());
            CityWeather cityWeather = cityWeatherService.getOne(cityWeatherQueryWrapper);
            Double temp = null;
            Double humidity = null;
            String windDir = null;
            Integer temp = null;
            Integer humidity = null;
            String windDir = "";
            Integer windScale = null;
            String cityWeatherValue = cityWeather.getValue();
            if (!ObjectUtils.isEmpty(cityWeatherValue)){
                JSONObject jsonObject = JSONObject.parseObject(cityWeatherValue);
                if (!ObjectUtils.isEmpty(jsonObject.get("temp"))){
                    temp = Double.parseDouble(jsonObject.get("temp").toString());
                }
                if (!ObjectUtils.isEmpty(jsonObject.get("humidity"))){
                    humidity = Double.parseDouble(jsonObject.get("humidity").toString());
                }
                if (!ObjectUtils.isEmpty(jsonObject.get("windDir"))){
                    windDir = jsonObject.get("windDir").toString();
                }
                if (!ObjectUtils.isEmpty(jsonObject.get("windScale"))){
                    windScale = Integer.parseInt(jsonObject.get("windScale").toString());
            if (!ObjectUtils.isEmpty(cityWeather)){
                String cityWeatherValue = cityWeather.getValue();
                if (!ObjectUtils.isEmpty(cityWeatherValue)){
                    JSONObject jsonObject = JSONObject.parseObject(cityWeatherValue);
                    if (!ObjectUtils.isEmpty(jsonObject.get("temp"))){
                        temp = Integer.parseInt(jsonObject.get("temp").toString());
                    }
                    if (!ObjectUtils.isEmpty(jsonObject.get("humidity"))){
                        humidity = Integer.parseInt(jsonObject.get("humidity").toString());
                    }
                    if (!ObjectUtils.isEmpty(jsonObject.get("windDir"))){
                        windDir = jsonObject.get("windDir").toString();
                    }
                    if (!ObjectUtils.isEmpty(jsonObject.get("windScale"))){
                        windScale = Integer.parseInt(jsonObject.get("windScale").toString());
                    }
                }
            }
            resultMap.put("weatherCondition","当前天气状况：温度"+temp+"℃，湿度"+humidity+"%,"+windDir+windScale+"级。");
            String temp_string = "";
            if (temp!=null){
                temp_string = temp.toString();
            }
            String humidity_string = "";
            if (humidity!=null){
                humidity_string = humidity.toString();
            }
            String windScale_string = "";
            if (windScale!=null){
                windScale_string = windScale.toString();
            }
            resultMap.put("weatherCondition","当前天气状况：温度"+temp_string+"℃，湿度"+humidity_string+"%,"+windDir+windScale_string+"级。");
            resultMap.put("auther","（七星瓢虫专家组）");
            resultList.add(resultMap);
        }
        return resultList;
        Integer totel = count-1;
        result.put("totel",totel);
        result.put("resultList",resultList);
        result.put("current",current);
        int totalPageNumber = totel/size;
        if(totel%size != 0){
            totalPageNumber += 1;
        }
        result.put("totalPageNumber",totalPageNumber);
        return result;
    }

    @Override
    public Map<String, Object> countyData(Integer regionCode) {
        Map<String,Object> resultMap = new HashMap<>();
        //获取时间
        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH");
        Calendar calendar = Calendar.getInstance();
        int minute = calendar.get(Calendar.MINUTE);
        if (minute >= 45){
            calendar.set(Calendar.HOUR_OF_DAY,calendar.get(Calendar.HOUR_OF_DAY)-1);
        }else {
            calendar.set(Calendar.HOUR_OF_DAY,calendar.get(Calendar.HOUR_OF_DAY)-2);
        }
        String time = df.format(calendar.getTime())+":00:00";
        QueryWrapper<CityAqi> cityAqiQueryWrapper = new QueryWrapper<>();
        cityAqiQueryWrapper.likeRight("city_code",regionCode.toString().substring(0,4));
        cityAqiQueryWrapper.ne("city_code",regionCode);
        cityAqiQueryWrapper.eq("time",time);
        List<CityAqi> cityAqis = cityAqiMapper.selectList(cityAqiQueryWrapper);
        QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>();
        sysAreaQueryWrapper.eq("parent_code",regionCode);
        List<SysArea> sysAreas = sysAreaMapper.selectList(sysAreaQueryWrapper);
        Map<Integer, Object> sysAreaMap = new HashMap<>();
        for (SysArea sysarea:sysAreas) {
            sysAreaMap.put(sysarea.getAreaCode(),sysarea.getAreaName());
        }
        List<Map<String,Object>> resultList = new ArrayList<>();
        for (CityAqi cityAqi:cityAqis) {
            if (!ObjectUtils.isEmpty(cityAqi.getValue())){
                Map<String, Object> cityAqiMap = new HashMap<>();
                String cityAqiValue = cityAqi.getValue();
                JSONObject jsonObject = JSONObject.parseObject(cityAqiValue);
                String AQI = "--";
                String PM10 = "--";
                String PM2_5 = "--";
                String SO2 = "--";
                String NO2 = "--";
                String CO = "--";
                String O3 = "--";
                String thirty = "--";
                String forty = "--";
                String fifty = "--";
                String city_name = "--";
                if (!ObjectUtils.isEmpty(jsonObject.get("AQI"))){
                    AQI = jsonObject.get("AQI").toString();
                    BigDecimal AQI_base = BigDecimal.valueOf(Double.parseDouble(AQI));
                    BigDecimal thirty_percent = BigDecimal.valueOf(1.3);
                    BigDecimal forty_percent = BigDecimal.valueOf(1.4);
                    BigDecimal fifty_percent = BigDecimal.valueOf(1.5);
                    Double AQI_thirty = AQI_base.multiply(thirty_percent).doubleValue();
                    Double AQI_forty = AQI_base.multiply(forty_percent).doubleValue();
                    Double AQI_fifty = AQI_base.multiply(fifty_percent).doubleValue();
                    thirty = String.valueOf(Math.round(AQI_thirty));
                    forty = String.valueOf(Math.round(AQI_forty));
                    fifty = String.valueOf(Math.round(AQI_fifty));
                }
                if (!ObjectUtils.isEmpty(jsonObject.get("PM10"))){
                    PM10 = String.valueOf(Math.round(Double.parseDouble(jsonObject.get("PM10").toString())));
                }
                if (!ObjectUtils.isEmpty(jsonObject.get("PM2_5"))){
                    PM2_5 = String.valueOf(Math.round(Double.parseDouble(jsonObject.get("PM2_5").toString())));
                }
                if (!ObjectUtils.isEmpty(jsonObject.get("SO2"))){
                    SO2 = String.valueOf(Math.round(Double.parseDouble(jsonObject.get("SO2").toString())));
                }
                if (!ObjectUtils.isEmpty(jsonObject.get("NO2"))){
                    NO2 = String.valueOf(Math.round(Double.parseDouble(jsonObject.get("NO2").toString())));
                }
                if (!ObjectUtils.isEmpty(jsonObject.get("CO"))){
                    CO = String.valueOf(Math.round(Double.parseDouble(jsonObject.get("CO").toString())));
                }
                if (!ObjectUtils.isEmpty(jsonObject.get("O3"))){
                    O3 = String.valueOf(Math.round(Double.parseDouble(jsonObject.get("O3").toString())));
                }
                if (!ObjectUtils.isEmpty(jsonObject.get("cityName"))){
                    city_name = jsonObject.get("cityName").toString();
                }
                cityAqiMap.put("AQI",AQI);
                cityAqiMap.put("PM10",PM10);
                cityAqiMap.put("PM2_5",PM2_5);
                cityAqiMap.put("SO2",SO2);
                cityAqiMap.put("NO2",NO2);
                cityAqiMap.put("CO",CO);
                cityAqiMap.put("O3",O3);
                cityAqiMap.put("thirty",thirty);
                cityAqiMap.put("forty",forty);
                cityAqiMap.put("fifty",fifty);
                cityAqiMap.put("city_name",city_name);
                resultList.add(cityAqiMap);
            }
            sysAreaMap.remove(cityAqi.getCityCode());
        }
        if (sysAreaMap.size()>0){
            for(Integer key:sysAreaMap.keySet()){
                Map<String,Object> nullMap = new HashMap<>();
                nullMap.put("AQI","--");
                nullMap.put("PM10","--");
                nullMap.put("PM2_5","--");
                nullMap.put("SO2","--");
                nullMap.put("NO2","--");
                nullMap.put("CO","--");
                nullMap.put("O3","--");
                nullMap.put("thirty","--");
                nullMap.put("forty","--");
                nullMap.put("fifty","--");
                nullMap.put("city_name",sysAreaMap.get(key));
                resultList.add(nullMap);
            }
        }
        resultMap.put("resultList",resultList);
        resultMap.put("time",time);
        QueryWrapper<SysArea> areaQueryWrapper = new QueryWrapper<>();
        areaQueryWrapper.eq("area_code",regionCode);
        SysArea sysArea = sysAreaMapper.selectOne(areaQueryWrapper);
        resultMap.put("areaName",sysArea.getAreaName());
        return resultMap;
    }

    /**
     * @Description: 计算6参和综合指数对比的百分比
     * @Param: [data, comparisonData]
     * @return: java.util.Map<java.lang.String                               ,                               com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent>
     * @return: java.util.Map<java.lang.String, com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent>
     * @Author: 陈凯裕
     * @Date: 2022/1/17
     */
@@ -1352,8 +1366,7 @@
    private List<SysArea> getSysAreasByRegionType(String regionType, Integer regionCode) {
        List<SysArea> areas;
        if (regionType.equals(Constants.TWENTY_EIGHT_CITIES)) {
            SpecialCitiesProperties properties = new SpecialCitiesProperties();
            areas = properties.getTwentyEightCities();
            areas = citiesProperties.getTwentyEightCities();
        } else {
            areas = sysAreaService.getChildren(regionCode);
        }
@@ -1413,4 +1426,53 @@
        Double avg = MathUtils.division(sum, num, 2);
        return avg;
    }

    /**
     * 使用java正则表达式去掉多余的.与0
     * @param s
     * @return
     */
    public static String subZeroAndDot(String s){
        if(s.indexOf(".") > 0){
            s = s.replaceAll("0+?$", "");//去掉多余的0
            s = s.replaceAll("[.]$", "");//如最后一位是.则去掉
        }
        return s;
    }

    public  List<Map<String, Object>> getO3_8H(List<Map<String, Object>> data , int type,String day) {
        List<Map<String, Object>> list = new ArrayList<>();
        for(int i = 0 ;i<=23;i++){
            Map<String, Object> map = new HashMap<>();
            if(type == 0){
                map.put("type","预测");
            }else {
                map.put("type","实测");
            }
            String times = day+" "+i;
            Date endDate = DateUtils.getDate(times,DateUtils.yyyy_MM_dd_HH_EN);
            Date startDate = DateUtils.addHours(DateUtils.getDate(day+" "+i,DateUtils.yyyy_MM_dd_HH_EN),-7);
            List<Double> value = new ArrayList<>();
            for(Map<String, Object> m : data){
                Date time = (Date) m.get("time");
                if(DateUtils.isTimeBeforE(time,startDate) && DateUtils.isTimeBeforE(endDate,time)){
                    Map<String, Object> sensorValue = JSONObject.parseObject((String) m.get("value"), Map.class);
                    Double o3 = Double.parseDouble(sensorValue.get("O3").toString());
                    value.add(o3);

                }
            }
            if (value.size() < 6) {
                continue;
            }
            double average = value.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage();
            map.put("O3", new BigDecimal(average).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue());
            map.put("time",times);
            list.add(map);
        }

        return list;

    }

}