From 273defb3cc6cbbd74494a853a23cb8fe14c22b8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 17 Feb 2022 14:33:16 +0800
Subject: [PATCH] 督办单增加组织id

---
 screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java |  946 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 870 insertions(+), 76 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
index eb6fc95..be28219 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -3,22 +3,33 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.config.properties.SpecialCitiesProperties;
 import com.moral.api.entity.CityAqi;
 import com.moral.api.entity.CityAqiDaily;
+import com.moral.api.entity.CityAqiMonthly;
+import com.moral.api.entity.CityAqiYearly;
 import com.moral.api.entity.Forecast;
 import com.moral.api.entity.Organization;
 import com.moral.api.entity.SysArea;
 import com.moral.api.mapper.CityAqiMapper;
 import com.moral.api.mapper.ForecastMapper;
+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.service.CityAqiDailyService;
+import com.moral.api.service.CityAqiMonthlyService;
 import com.moral.api.service.CityAqiService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.CityAqiYearlyService;
 import com.moral.api.service.OrganizationService;
 import com.moral.api.service.SysAreaService;
 import com.moral.constant.Constants;
 import com.moral.constant.RedisConstants;
+import com.moral.pojo.AQI;
 import com.moral.util.AQIUtils;
 import com.moral.util.AmendUtils;
+import com.moral.util.ComprehensiveIndexUtils;
 import com.moral.util.DateUtils;
 
 import com.moral.util.MathUtils;
@@ -28,7 +39,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import java.text.DecimalFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 import java.util.stream.DoubleStream;
 
 /**
@@ -52,13 +65,19 @@
     private RedisTemplate redisTemplate;
 
     @Autowired
-    private OrganizationService organizationService;
-
-    @Autowired
     private SysAreaService sysAreaService;
 
     @Autowired
     private CityAqiDailyService cityAqiDailyService;
+
+    @Autowired
+    private CityAqiMonthlyService cityAqiMonthlyService;
+
+    @Autowired
+    private CityAqiYearlyService cityAqiYearlyService;
+
+    @Autowired
+    private SpecialCitiesProperties specialCitiesProperties;
 
     @Override
     public List<Map<String, Object>> measuredCompareForecastOfO3(Map<String, Object> params) {
@@ -88,7 +107,7 @@
                     Date date = (Date) forecastDatum.get("time");
                     String value = forecastDatum.get("value").toString();
                     Map<String, Object> data = JSONObject.parseObject(value, Map.class);
-                    Object o3 = data.get("o3");
+                    Object o3 = data.get("O3");
                     if (i == DateUtils.getHour(date) * 2) {
                         if (!ObjectUtils.isEmpty(o3)) {
                             map.put("O3", o3);
@@ -103,7 +122,7 @@
                     Date date = (Date) measuredDatum.get("time");
                     String value = measuredDatum.get("value").toString();
                     Map<String, Object> data = JSONObject.parseObject(value, Map.class);
-                    Object o3 = data.get("o3");
+                    Object o3 = data.get("O3");
                     if (i == (DateUtils.getHour(date) * 2 + 1)) {
                         if (!ObjectUtils.isEmpty(o3)) {
                             map.put("O3", o3);
@@ -121,10 +140,25 @@
         Map<String, Object> value = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.CITY_AQI, String.valueOf(regionCode));
         if (value == null)
             value = queryCityAqiByRegionCodeFromDB(regionCode);
+        //������������������������������������������������������������
+        if (value == null) {
+            String regionCodeStr = String.valueOf(regionCode);
+            String end = regionCodeStr.substring(regionCodeStr.length() - 2, regionCodeStr.length());
+            if (!end.equals(00)) {
+                regionCodeStr = regionCodeStr.substring(0, regionCodeStr.length() - 2);
+                regionCodeStr += "00";
+                regionCode = Integer.parseInt(regionCodeStr);
+                value = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.CITY_AQI, String.valueOf(regionCode));
+                if (value == null)
+                    value = queryCityAqiByRegionCodeFromDB(regionCode);
+            } else {
+                return null;
+            }
+        }
         //������AQI������������������
-        if (value == null || value.get("aqi") == null)
+        if (value == null || value.get("AQI") == null)
             return null;
-        Integer aqi = Integer.parseInt(value.get("aqi").toString());
+        Integer aqi = Integer.parseInt(value.get("AQI").toString());
         String category = AQIUtils.classOfPollutionByAqi(aqi);
         value.put("category", category);
         return value;
@@ -138,6 +172,8 @@
         lastDataWrapper.orderByDesc("time");
         lastDataWrapper.last(true, "limit 1");
         CityAqi cityAqi = cityAqiMapper.selectOne(lastDataWrapper);
+        if (cityAqi == null)
+            return null;
         //���������24������������������
         Date endDate = cityAqi.getTime();
         Date startDate = DateUtils.addHours(endDate, -23);
@@ -162,17 +198,17 @@
             //������������������������
             cityAqis.sort(Comparator.comparing(CityAqi::getTime));
         }
-        //������������������,map���key���HH:mm������������������value���aqi���������
+        //������������������,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(), "HH:mm");
+            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");
+            Object aqiData = allDataMap.get("AQI");
             if (aqiData == null)
                 result.put(key, "");
             else
@@ -195,7 +231,10 @@
         //���������������
         Map<String, Object> sixParamAvg = calculate6ParamAvg(cityAqis);
         //������������aqi������������������
-        Map<String, Object> result = AQIUtils.hourlyAqi_pollutant(sixParamAvg);
+        Map<String, Object> result = new HashMap<>();
+        AQI aqi = AQIUtils.hourlyAQI(sixParamAvg);
+        result.put("aqi", aqi.getAQIValue());
+        result.put("pollutant", aqi.getPrimaryPollutantNames());
         //���������������������
         CityAqi lastCityAqi = cityAqis.get(cityAqis.size() - 1);
         String time = DateUtils.dateToDateString(lastCityAqi.getTime(), "HH:mm");
@@ -203,64 +242,590 @@
         return result;
     }
 
-    /**
-     * @Description: ������6������������
-     * @Param: [cityAqiList]
-     * @return: java.util.Map<java.lang.String, java.lang.Double>
-     * ���������key���sensorCode,value������
-     * @Author: ���������
-     * @Date: 2021/11/2
-     */
-    private Map<String, Object> calculate6ParamAvg(List<CityAqi> cityAqiList) {
-        Double co = calculateSensorAvg(cityAqiList, "co");
-        Double pm2_5 = calculateSensorAvg(cityAqiList, "pm2_5");
-        Double pm10 = calculateSensorAvg(cityAqiList, "pm10");
-        Double so2 = calculateSensorAvg(cityAqiList, "so2");
-        Double no2 = calculateSensorAvg(cityAqiList, "no2");
-        Double o3 = calculateSensorAvg(cityAqiList, "o3");
-        Map<String, Object> result = new HashMap<>();
-        result.put(Constants.SENSOR_CODE_CO, co);
-        result.put(Constants.SENSOR_CODE_NO2, no2);
-        result.put(Constants.SENSOR_CODE_SO2, so2);
-        result.put(Constants.SENSOR_CODE_O3, o3);
-        result.put(Constants.SENSOR_CODE_PM25, pm2_5);
-        result.put(Constants.SENSOR_CODE_PM10, pm10);
+    @Override
+    public List<Map<String, Object>> rankingDetails(Map<String, Object> params) {
+        List<Map<String, Object>> result = new ArrayList<>();
+        int regionCode = Integer.parseInt(params.get("regionCode").toString());
+        String type = params.get("type").toString();
+        String time = null;
+        if (!ObjectUtils.isEmpty(params.get("time"))) {
+            time = params.get("time").toString();
+        }
+        String start = null;
+        String end = null;
+        if (!ObjectUtils.isEmpty(params.get("start")) || !ObjectUtils.isEmpty(params.get("end"))) {
+            start = params.get("start").toString();
+            end = params.get("end").toString();
+        }
+        String cityType = params.get("cityType").toString();
+
+        String s = String.valueOf(regionCode);
+        //���������������,���code
+        Integer curProvinceCode = Integer.parseInt(s.substring(0, 2) + "0000");
+        Integer curCityCode = Integer.parseInt(s.substring(0, 4) + "00");
+
+        QueryWrapper<SysArea> areaWrapper = new QueryWrapper<>();
+
+        List<SysArea> sysAreas;
+        if ("28".equals(cityType)) {
+            //������2+26������
+            sysAreas = specialCitiesProperties.getTwentyEightCities();
+        } else {
+            if ("province".equals(cityType)) {
+                //���������������������
+                areaWrapper.select("area_code", "area_name").eq("parent_code", curProvinceCode);
+            } else {
+                //������������������������
+                areaWrapper.select("area_code", "area_name").eq("parent_code", curCityCode);
+            }
+            sysAreas = sysAreaService.list(areaWrapper);
+        }
+
+        switch (type) {
+            case "today":
+                result = accumulatedTodayRank(sysAreas);
+                break;
+            case "hour":
+                time = new StringBuilder(time).replace(10, 11, " ").toString() + ":00:00";
+                result = hourRank(sysAreas, time);
+                break;
+            case "day":
+                time = time + " 00:00:00";
+                result = dayRank(sysAreas, time);
+                break;
+            case "month":
+                time = time + "-01 00:00:00";
+                result = monthRank(sysAreas, time);
+                break;
+            case "year":
+                time = time + "-01-01 00:00:00";
+                result = yearRank(sysAreas, time);
+                break;
+            case "custom":
+                start = start + " 00:00:00";
+                end = end + " :00:00";
+                result = customRank(sysAreas, start, end);
+                break;
+            default:
+                break;
+        }
         return result;
     }
 
     /**
-     * @Description: ������������������������
-     * @Param: [cityAqiList, sensor]
-     * ���sensor���������������������������
-     * @return: java.lang.Double
-     * @Author: ���������
-     * @Date: 2021/11/2
+     * @param sysAreas ������������������������
+     * @return ���������������������������
      */
-    private Double calculateSensorAvg(List<CityAqi> cityAqiList, String sensor) {
-        Double sum = 0d;
-        int num = 0;
-        for (CityAqi cityAqi : cityAqiList) {
-            String value = cityAqi.getValue();
-            if (value == null)
-                continue;
-            Map<String, Object> valueMap = JSON.parseObject(value, Map.class);
-            Object sensorValueObject = valueMap.get(sensor);
-            if (sensorValueObject == null)
-                continue;
-            Double sensorValue = Double.valueOf(sensorValueObject.toString());
-            sum = MathUtils.add(sum, sensorValue);
-            num++;
-        }
-        if (num == 0)
-            return null;
-        Double avg = MathUtils.division(sum, num, 2);
-        return avg;
+    private List<Map<String, Object>> accumulatedTodayRank(List<SysArea> sysAreas) {
+        List<Integer> regionCodes = sysAreas.stream()
+                .map(SysArea::getAreaCode)
+                .collect(Collectors.toList());
+
+        List<Map<String, Object>> result = new ArrayList<>();
+        List<String> sensors = Arrays.asList("PM2_5", "PM10", "SO2", "NO2", "CO", "O3");
+        Date now = new Date();
+        String today = DateUtils.dateToDateString(now, DateUtils.yyyy_MM_dd_EN);
+        QueryWrapper<CityAqi> wrapper = new QueryWrapper<>();
+        wrapper.select("city_code", "value")
+                .ge("time", today)
+                .in("city_code", regionCodes);
+        List<Map<String, Object>> cumulativeData = cityAqiMapper.selectMaps(wrapper);
+        //���city_code������
+        Map<Integer, List<Map<String, Object>>> data = cumulativeData.parallelStream().collect(Collectors.groupingBy(o -> Integer.parseInt(o.get("city_code").toString())));
+        data.forEach((cityCode, value) -> {
+            List<Double> doubles = new ArrayList<>();
+            for (Map<String, Object> objectMap : value) {
+                Object o = JSONObject.parseObject((String) objectMap.get("value"), Map.class).get("O3_8H");
+                if (!ObjectUtils.isEmpty(o)) {
+                    double v = Double.parseDouble(o.toString());
+                    doubles.add(v);
+                }
+            }
+
+            Map<String, Object> dataMap = new HashMap<>();
+            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);
+                    if ("CO".equals(sensor)) {
+                        sciCal = AmendUtils.sciCal(optionalDouble.getAsDouble(), 1);
+                    }
+                    dataMap.put(sensor, sciCal);
+                }
+            });
+
+            //������������O3_8H������,������������O3������8H���������
+            if (!ObjectUtils.isEmpty(doubles)) {
+                dataMap.put("O3_8H", Collections.max(doubles));
+            }
+
+            //������������aqi,���������������������
+            Map<String, Object> sixParamMap = new HashMap<>();
+            sixParamMap.put(Constants.SENSOR_CODE_PM25, dataMap.get("PM2_5"));
+            sixParamMap.put(Constants.SENSOR_CODE_PM10, dataMap.get("PM10"));
+            sixParamMap.put(Constants.SENSOR_CODE_SO2, dataMap.get("SO2"));
+            sixParamMap.put(Constants.SENSOR_CODE_NO2, dataMap.get("NO2"));
+            sixParamMap.put(Constants.SENSOR_CODE_CO, dataMap.get("CO"));
+            sixParamMap.put(Constants.SENSOR_CODE_O3, dataMap.get("O3"));
+            AQI aqi = AQIUtils.dailyAQI(sixParamMap);
+            dataMap.put("AQI", aqi.getAQIValue());
+            List<String> primaryPollutantNames = aqi.getPrimaryPollutantNames();
+            String primaryPollutant = "";
+            if (!ObjectUtils.isEmpty(primaryPollutantNames)) {
+                primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));
+            }
+            dataMap.put("primaryPollutant", primaryPollutant);
+
+            //������������������������������,O3������������O3_8H������
+            Map<String, Object> compositeIndexMap = new HashMap<>(dataMap);
+            compositeIndexMap.put("O3", compositeIndexMap.get("O3_8H"));
+            Double compositeIndex = ComprehensiveIndexUtils.dailyData(compositeIndexMap);
+            dataMap.put("compositeIndex", compositeIndex);
+
+            //���������
+            for (SysArea sysArea : sysAreas) {
+                if (cityCode.equals(sysArea.getAreaCode())) {
+                    dataMap.put("cityName", sysArea.getAreaName());
+                    break;
+                }
+            }
+            result.add(dataMap);
+        });
+        return result;
     }
+
+    /**
+     * @param sysAreas ������������������������
+     * @param time     ��������������������������� 2021-11-04 13:00:00
+     * @return ���������������������
+     */
+    private List<Map<String, Object>> hourRank(List<SysArea> sysAreas, String time) {
+        List<Integer> regionCodes = sysAreas.stream()
+                .map(SysArea::getAreaCode)
+                .collect(Collectors.toList());
+
+        List<Map<String, Object>> result = new ArrayList<>();
+        QueryWrapper<CityAqi> wrapper = new QueryWrapper<>();
+        wrapper.select("value")
+                .eq("time", time)
+                .in("city_code", regionCodes);
+        List<Map<String, Object>> hourData = cityAqiMapper.selectMaps(wrapper);
+        for (Map<String, Object> hourDatum : hourData) {
+            Map<String, Object> value = JSONObject.parseObject((String) hourDatum.get("value"), Map.class);
+            List<String> primaryPollutantNames = (List<String>) value.get("primaryPollutant");
+            String primaryPollutant = "";
+            if (!ObjectUtils.isEmpty(primaryPollutantNames)) {
+                primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));
+            }
+            value.put("primaryPollutant", primaryPollutant);
+            value.remove("pubtime");
+            value.remove("rank");
+            result.add(value);
+        }
+        return result;
+    }
+
+    /**
+     * @param sysAreas ������������������������
+     * @param time     ��������������������������� 2021-11-04 00:00:00
+     * @return ������������������
+     */
+    private List<Map<String, Object>> dayRank(List<SysArea> sysAreas, String time) {
+        List<Integer> regionCodes = sysAreas.stream()
+                .map(SysArea::getAreaCode)
+                .collect(Collectors.toList());
+
+        List<Map<String, Object>> result = new ArrayList<>();
+        QueryWrapper<CityAqiDaily> wrapper = new QueryWrapper<>();
+        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");
+            String primaryPollutant = "";
+            if (!ObjectUtils.isEmpty(primaryPollutantNames)) {
+                primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));
+            }
+            value.put("primaryPollutant", primaryPollutant);
+
+
+            //���������
+            for (SysArea sysArea : sysAreas) {
+                if (dayDatum.get("city_code").equals(sysArea.getAreaCode())) {
+                    value.put("cityName", sysArea.getAreaName());
+                    break;
+                }
+            }
+            result.add(value);
+        }
+        return result;
+    }
+
+    /**
+     * @param sysAreas ������������������������
+     * @param time     ��������������������������� 2021-11-01 00:00:00 ������1���
+     * @return ������������������
+     */
+    private List<Map<String, Object>> monthRank(List<SysArea> sysAreas, String time) {
+        List<Integer> regionCodes = sysAreas.stream()
+                .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)
+                .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������
+            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())) {
+                    resultMap.put("cityName", sysArea.getAreaName());
+                    break;
+                }
+            }
+            result.add(resultMap);
+        });
+        return result;
+    }
+
+    /**
+     * @param sysAreas ������������������������
+     * @param time     ��������������������������� 2021-11-01 00:00:00 ������1���1���
+     * @return ������������������
+     */
+    private List<Map<String, Object>> yearRank(List<SysArea> sysAreas, String time) {
+        List<Integer> regionCodes = sysAreas.stream()
+                .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������
+            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())) {
+                    resultMap.put("cityName", sysArea.getAreaName());
+                    break;
+                }
+            }
+            result.add(resultMap);
+        });
+        return result;
+    }
+
+    /**
+     * @param sysAreas ������������������������
+     * @param start    ���������������������������������,���������������2021-11-03 00:00:00
+     * @param end      ���������������������������������,���������������2021-11-25 00:00:00
+     * @return ������������������������
+     */
+    private List<Map<String, Object>> customRank(List<SysArea> sysAreas, String start, String end) {
+        List<Integer> regionCodes = sysAreas.stream()
+                .map(SysArea::getAreaCode)
+                .collect(Collectors.toList());
+
+        //���������������������������
+        List<String> sensors = Arrays.asList("PM2_5", "PM10", "SO2", "NO2");
+        List<Map<String, Object>> result = new ArrayList<>();
+        QueryWrapper<CityAqiDaily> cityAqiDailyQueryWrapper = new QueryWrapper<>();
+        cityAqiDailyQueryWrapper.select("city_code", "value")
+                .ge("time", start)
+                .le("time", end)
+                .in("city_code", regionCodes);
+        List<Map<String, Object>> thisMonthData = cityAqiDailyService.listMaps(cityAqiDailyQueryWrapper);
+        //���city_code������
+        Map<Integer, List<Map<String, Object>>> customMap = thisMonthData.parallelStream()
+                .collect(Collectors.groupingBy(o -> Integer.parseInt(o.get("city_code").toString())));
+        customMap.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������
+            resultMap.put("O3_8H", resultMap.remove("O3"));
+
+            //���������
+            for (SysArea sysArea : sysAreas) {
+                if (cityCode.equals(sysArea.getAreaCode())) {
+                    resultMap.put("cityName", sysArea.getAreaName());
+                    break;
+                }
+            }
+            result.add(resultMap);
+        });
+        return result;
+    }
+
 
     /**
      * @Description: ������������������������
      * @Param: [regionCode]
-     * @return: java.util.Map<java.lang.String, java.lang.Object>
+     * @return: java.util.Map<java.lang.String                                                               ,                                                                                                                               java.lang.Object>
      * @Author: ���������
      * @Date: 2021/10/28
      */
@@ -278,7 +843,7 @@
     }
 
     @Override
-    public Map<String, Object> provincialRanking(Integer organizationId) {
+    public Map<String, Object> provincialRanking(Integer regionCode) {
         //���������
         Map<String, Object> result = new HashMap<>();
 
@@ -287,10 +852,10 @@
         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 s = String.valueOf(regionCode);
         //���������,���code
-        Organization organization = organizationService.getById(organizationId);
-        Integer provinceCode = organization.getProvinceCode();
-        Integer cityCode = organization.getCityCode();
+        Integer provinceCode = Integer.parseInt(s.substring(0, 2) + "0000");
+        Integer cityCode = Integer.parseInt(s.substring(0, 4) + "00");
         //������������������city_code
         QueryWrapper<SysArea> wrapper = new QueryWrapper<>();
         wrapper.select("area_code").eq("parent_code", provinceCode);
@@ -308,9 +873,8 @@
             if (!ObjectUtils.isEmpty(one)) {
                 String value = one.getValue();
                 Map<String, Object> valueMap = JSONObject.parseObject(value, Map.class);
-                rankMap.put("aqi", valueMap.get("aqi"));
+                rankMap.put("AQI", valueMap.get("AQI"));
             }
-
 
             //2.������������������������������������������������
             queryWrapper.clear();
@@ -349,13 +913,15 @@
         }
 
         //���������������aqi������
-        ranks.removeIf(o -> o.get("aqi") == null);
-        sortByField(ranks, "aqi");
+        ranks.removeIf(o -> o.get("AQI") == null);
+        sortByField(ranks, "AQI");
         //���������������
-        Map<String, Object> dayMap = rankByField(ranks, cityCode, "aqi", cityCodes.size());
-        if (!ObjectUtils.isEmpty(dayMap)) {
-            dayMap.put("aqi", dayMap.remove("value"));
+        Map<String, Object> dayMap = rankByField(ranks, cityCode, "AQI", cityCodes.size());
+        if (ObjectUtils.isEmpty(dayMap)) {
+            dayMap.put("rank", null);
+            dayMap.put("size", null);
         }
+        dayMap.put("AQI", dayMap.remove("value"));
         result.put("day", dayMap);
 
         //������������������������������
@@ -363,25 +929,182 @@
         sortByField(ranks, "compositeIndexMonth");
         //���������������
         Map<String, Object> monthMap = rankByField(ranks, cityCode, "compositeIndexMonth", cityCodes.size());
-        if (!ObjectUtils.isEmpty(monthMap)) {
-            monthMap.put("compositeIndex", monthMap.remove("value"));
+        if (ObjectUtils.isEmpty(monthMap)) {
+            monthMap.put("rank", null);
+            monthMap.put("size", null);
         }
+        monthMap.put("compositeIndex", monthMap.remove("value"));
         result.put("month", monthMap);
 
         //������������������������������
         sortByField(ranks, "compositeIndexYear");
-        //���������������
-        sortByField(ranks, "compositeIndexYear");
         Map<String, Object> yearMap = rankByField(ranks, cityCode, "compositeIndexYear", cityCodes.size());
-        if(!ObjectUtils.isEmpty(yearMap)){
-            yearMap.put("compositeIndex", yearMap.remove("value"));
+        if (ObjectUtils.isEmpty(yearMap)) {
+            yearMap.put("rank", null);
+            yearMap.put("size", null);
         }
+        yearMap.put("compositeIndex", yearMap.remove("value"));
         result.put("year", yearMap);
 
         //���������������
         result.put("time", DateUtils.dateToDateString(yesterday, DateUtils.yyyy_MM_dd_EN));
         return result;
     }
+
+    @Override
+    public List<AirQualityComparisonVO> queryAirQualityComparison(AirQualityComparisonForm form) {
+        //������
+        Integer regionCode = form.getRegionCode();
+        String regionType = form.getRegionType();
+        Date startDate = form.getStartDate();
+        Date endDate = form.getEndDate();
+        Date comparisonStartDate = form.getComparisonStartDate();
+        Date comparisonEndDate = form.getComparisonEndDate();
+        String dateType = form.getDateType();
+        //������������/������
+        List<SysArea> areas = getSysAreasByRegionType(regionType, regionCode);
+        if (ObjectUtils.isEmpty(areas))
+            return null;
+        List<AirQualityComparisonVO> vos = new ArrayList<>();
+        for (SysArea area : areas) {
+            //������������������������������������6������������������
+            Map<String, Object> data = getDataByTimeTypeAndRegionCode(dateType, startDate, endDate, area.getAreaCode());
+            Map<String, Object> comparisonData = getDataByTimeTypeAndRegionCode(dateType, comparisonStartDate, comparisonEndDate, area.getAreaCode());
+            if (ObjectUtils.isEmpty(data) || ObjectUtils.isEmpty(comparisonData))
+                continue;
+            //���������������������������������������
+            CityPollutionLevel days = cityAqiDailyService.calculateDaysByTimeAndSysArea(area, startDate, endDate);
+            CityPollutionLevel comparisonDays = cityAqiDailyService.calculateDaysByTimeAndSysArea(area, comparisonStartDate, comparisonEndDate);
+            int fineDays = days.getExcellentWeatherDays() + days.getGoodWeatherDays();
+            int serverDays = days.getSeriousWeatherDays() + days.getServerWeatherDays();
+            int comparisonFineDays = comparisonDays.getExcellentWeatherDays() + comparisonDays.getGoodWeatherDays();
+            int comparisonServerDays = comparisonDays.getSeriousWeatherDays() + comparisonDays.getServerWeatherDays();
+            //������6������������������
+            Map<String, ConcentrationAndPercent> sixParamAndComIndexResult = contrastSixParamAndComIndex(data, comparisonData);
+            //������������������������������������������
+            ConcentrationAndPercent fine = contrastDays(fineDays, comparisonFineDays);
+            ConcentrationAndPercent server = contrastDays(serverDays, comparisonServerDays);
+            //������������������
+            AirQualityComparisonVO vo = new AirQualityComparisonVO();
+            vo.setFineDays(fine);
+            vo.setServerDays(server);
+            vo.setCO(sixParamAndComIndexResult.get("CO"));
+            vo.setO3(sixParamAndComIndexResult.get("O3"));
+            vo.setPM25(sixParamAndComIndexResult.get("PM2_5"));
+            vo.setPM10(sixParamAndComIndexResult.get("PM10"));
+            vo.setSO2(sixParamAndComIndexResult.get("SO2"));
+            vo.setNO2(sixParamAndComIndexResult.get("NO2"));
+            vo.setCompositeIndex(sixParamAndComIndexResult.get("compositeIndex"));
+            vo.setCityName(area.getAreaName());
+            vos.add(vo);
+        }
+        return vos;
+    }
+
+    /**
+     * @Description: ������6������������������������������������
+     * @Param: [data, comparisonData]
+     * @return: java.util.Map<java.lang.String                               ,                               com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent>
+     * @Author: ���������
+     * @Date: 2022/1/17
+     */
+    private Map<String, ConcentrationAndPercent> contrastSixParamAndComIndex(Map<String, Object> data, Map<String, Object> comparisonData) {
+        Map<String, ConcentrationAndPercent> result = new HashMap<>();
+        result.put("CO", contrastParam(Double.parseDouble(data.get("CO").toString()), Double.parseDouble(comparisonData.get("CO").toString()), "CO"));
+        result.put("NO2", contrastParam(Double.parseDouble(data.get("NO2").toString()), Double.parseDouble(comparisonData.get("NO2").toString()), "NO2"));
+        result.put("SO2", contrastParam(Double.parseDouble(data.get("SO2").toString()), Double.parseDouble(comparisonData.get("SO2").toString()), "SO2"));
+        result.put("O3", contrastParam(Double.parseDouble(data.get("O3").toString()), Double.parseDouble(comparisonData.get("O3").toString()), "O3"));
+        result.put("PM2_5", contrastParam(Double.parseDouble(data.get("PM2_5").toString()), Double.parseDouble(comparisonData.get("PM2_5").toString()), "PM2_5"));
+        result.put("PM10", contrastParam(Double.parseDouble(data.get("PM10").toString()), Double.parseDouble(comparisonData.get("PM10").toString()), "PM10"));
+        result.put("compositeIndex", contrastParam(Double.parseDouble(data.get("compositeIndex").toString()), Double.parseDouble(comparisonData.get("compositeIndex").toString()), "compositeIndex"));
+        return result;
+    }
+
+    /**
+     * @Description: ������6������������������������/���������������������
+     * @Param: [data, comparisonData]
+     * @return: com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent
+     * @Author: ���������
+     * @Date: 2022/1/17
+     */
+    private ConcentrationAndPercent contrastParam(Double data, Double comparisonData, String sensor) {
+        double percentD = MathUtils.division(data - comparisonData, comparisonData, 4);
+        String percent = MathUtils.mul(percentD,100d) + "%";
+        ConcentrationAndPercent concentrationAndPercent = new ConcentrationAndPercent();
+        concentrationAndPercent.setPercent(percent);
+        if (sensor.equals("CO")) {//CO���������������������
+            Double CO = AmendUtils.sciCal(data, 1);
+            concentrationAndPercent.setConcentration(CO.toString());
+        }else if (sensor.equals("compositeIndex")){
+            concentrationAndPercent.setConcentration(data.toString());
+        }else{
+            Double sensorD = AmendUtils.sciCal(data, 0);
+            Integer sensorI = new Double(sensorD).intValue();
+            concentrationAndPercent.setConcentration(sensorI.toString());
+        }
+        return concentrationAndPercent;
+    }
+
+    /**
+     * @Description: ���������������������������������
+     * @Param: [days, comparisonDays]
+     * @return: com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent
+     * @Author: ���������
+     * @Date: 2022/1/17
+     */
+    private ConcentrationAndPercent contrastDays(Integer days, Integer comparisonDays) {
+        ConcentrationAndPercent concentrationAndPercent = new ConcentrationAndPercent();
+        concentrationAndPercent.setConcentration(days.toString());
+        Integer result = days - comparisonDays;
+        concentrationAndPercent.setPercent(result.toString() + "���");
+        return concentrationAndPercent;
+    }
+
+    /**
+     * @Description: ���������������������������������6������������������������������������������������������������������������
+     * @Param: [comparisonType, startDate, endDate, regionCode]
+     * @return: java.util.Map<java.lang.String                                                               ,                                                               java.lang.Object>
+     * @Author: ���������
+     * @Date: 2022/1/17
+     */
+    private Map<String, Object> getDataByTimeTypeAndRegionCode(String TimeType, Date startDate, Date endDate, Integer regionCode) {
+        Map<String, Object> data;
+        if (Constants.MONTH.equals(TimeType) && (!DateUtils.isCurrentMonth(startDate) || !DateUtils.isCurrentYear(startDate))) {//��������������� ���������������
+            List<CityAqiMonthly> cityAqis = cityAqiMonthlyService.getCityAqiMonthByRegionCodeAndTime(regionCode, startDate, endDate);
+            if (ObjectUtils.isEmpty(cityAqis))
+                return null;
+            data = JSON.parseObject(cityAqis.get(0).getValue(), Map.class);
+        } else if (Constants.YEAR.equals(TimeType) && (!DateUtils.isCurrentYear(startDate))) {//��������������� ���������������
+            List<CityAqiYearly> cityAqis = cityAqiYearlyService.getCityAqiYearlyByRegionCodeAndTime(regionCode, startDate, endDate);
+            if (ObjectUtils.isEmpty(cityAqis))
+                return null;
+            data = JSON.parseObject(cityAqis.get(0).getValue(), Map.class);
+        } else {//���������������������
+            List<CityAqiDaily> cityAqis = cityAqiDailyService.getCityAqiDailyByRegionCodeAndTime(regionCode, startDate, endDate);
+            if (ObjectUtils.isEmpty(cityAqis))
+                return null;
+            List<CityAqi> newCityAqis = new ArrayList<>();
+            List<Map<String, Object>> dailyDataMaps = new ArrayList<>();
+            cityAqis.forEach((value) -> {
+                newCityAqis.add(new CityAqi(value));
+                dailyDataMaps.add(JSON.parseObject(value.getValue(), Map.class));
+            });
+            //������������
+            data = calculate6ParamAvg(newCityAqis);
+            //���������������
+            data.put("CO", Double.parseDouble(data.remove(Constants.SENSOR_CODE_CO).toString()));
+            data.put("NO2", Double.parseDouble(data.remove(Constants.SENSOR_CODE_NO2).toString()));
+            data.put("SO2", Double.parseDouble(data.remove(Constants.SENSOR_CODE_SO2).toString()));
+            data.put("O3", Double.parseDouble(data.remove(Constants.SENSOR_CODE_O3).toString()));
+            data.put("PM2_5", Double.parseDouble(data.remove(Constants.SENSOR_CODE_PM25).toString()));
+            data.put("PM10", Double.parseDouble(data.remove(Constants.SENSOR_CODE_PM10).toString()));
+            //������������������
+            Double compositeIndex = ComprehensiveIndexUtils.dailyData(data);
+            data.put("compositeIndex", compositeIndex);
+        }
+        return data;
+    }
+
 
     //������������������
     private void sortByField(List<Map<String, Object>> list, String sortField) {
@@ -414,4 +1137,75 @@
         return result;
     }
 
+    /**
+     * @Description: ���������������������������������������������������������
+     * @Param: [regionType, regionCode]
+     * @return: java.util.List<com.moral.api.entity.SysArea>
+     * @Author: ���������
+     * @Date: 2022/1/14
+     */
+    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();
+        } else {
+            areas = sysAreaService.getChildren(regionCode);
+        }
+        return areas;
+    }
+
+    /**
+     * @Description: ������6������������
+     * @Param: [cityAqiList]
+     * @return: java.util.Map<java.lang.String                                                               ,                                                                                                                               java.lang.Double>
+     * ���������key���sensorCode,value������
+     * @Author: ���������
+     * @Date: 2021/11/2
+     */
+    private Map<String, Object> calculate6ParamAvg(List<CityAqi> cityAqiList) {
+        Double co = calculateSensorAvg(cityAqiList, "CO");
+        Double pm2_5 = calculateSensorAvg(cityAqiList, "PM2_5");
+        Double pm10 = calculateSensorAvg(cityAqiList, "PM10");
+        Double so2 = calculateSensorAvg(cityAqiList, "SO2");
+        Double no2 = calculateSensorAvg(cityAqiList, "NO2");
+        Double o3 = calculateSensorAvg(cityAqiList, "O3");
+        Map<String, Object> result = new HashMap<>();
+        result.put(Constants.SENSOR_CODE_CO, co);
+        result.put(Constants.SENSOR_CODE_NO2, no2);
+        result.put(Constants.SENSOR_CODE_SO2, so2);
+        result.put(Constants.SENSOR_CODE_O3, o3);
+        result.put(Constants.SENSOR_CODE_PM25, pm2_5);
+        result.put(Constants.SENSOR_CODE_PM10, pm10);
+        return result;
+    }
+
+    /**
+     * @Description: ������������������������
+     * @Param: [cityAqiList, sensor]
+     * ���sensor���������������������������
+     * @return: java.lang.Double
+     * @Author: ���������
+     * @Date: 2021/11/2
+     */
+    private Double calculateSensorAvg(List<CityAqi> cityAqiList, String sensor) {
+        Double sum = 0d;
+        int num = 0;
+        for (CityAqi cityAqi : cityAqiList) {
+            String value = cityAqi.getValue();
+            if (value == null)
+                continue;
+            Map<String, Object> valueMap = JSON.parseObject(value, Map.class);
+            Object sensorValueObject = valueMap.get(sensor);
+            if (sensorValueObject == null)
+                continue;
+            Double sensorValue = Double.valueOf(sensorValueObject.toString());
+            sum = MathUtils.add(sum, sensorValue);
+            num++;
+        }
+        if (num == 0)
+            return null;
+        Double avg = MathUtils.division(sum, num, 2);
+        return avg;
+    }
 }

--
Gitblit v1.8.0