parent: 8e1a1a16 | patch | commit | ignore whitespace
kaiyu
2022-03-24 a827480e5e74cb6550c5f7b842bccac3023c5bdc 
screen-api
7 files modified
247 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/AqiController.java 27 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java 10 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/CityAqiService.java 5 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java 182 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java 21 ●●●●● patch | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/CityAqiMonthlyService.java 1 ●●●●● patch | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java 1 ●●●●● patch | view | raw | blame | history 
 screen-api/src/main/java/com/moral/api/controller/AqiController.java


@@ -329,32 +329,7 @@


            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),


                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());


        }


        CityAreaRangeVO vo = new CityAreaRangeVO();




        ConcentrationAndPercent cap = new ConcentrationAndPercent();


        cap.setConcentration("浓度/天数/指数");


        cap.setPercent("同比");


        cap.setCompareConcentration("同比浓度");


        ConcentrationAndPercent cap2 = new ConcentrationAndPercent();


        cap2.setConcentration("浓度/天数/指数");


        cap2.setPercent("同比");




        vo.setCityName("xxx");


        vo.setRange(0);


        vo.setCompositeIndex(cap);


        vo.setCO(cap);


        vo.setNO2(cap);


        vo.setSO2(cap);


        vo.setPM10(cap);


        vo.setPM25(cap);


        vo.setO3(cap);


        vo.setServerDays(cap2);


        vo.setFineDays(cap2);




        List<CityAreaRangeVO> vos = new ArrayList<>();


        vos.add(vo);


        vos.add(vo);




        List<CityAreaRangeVO> vos = cityAqiDailyService.cityAreaRange(regionCode,time);


        return ResultMessage.ok(vos);


    }






 screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java


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


import com.moral.api.pojo.dto.cityAQI.CityPollutionLevel;


import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel;


import com.moral.api.pojo.form.aqi.*;


import com.moral.api.pojo.vo.cityAQI.CityAreaRangeVO;


import com.moral.api.pojo.vo.cityAQI.PieChartOfPollutionLevelVO;




import java.util.Date;


@@ -103,5 +104,14 @@


            */


    List<String> airQualityBulletin(String regionCode,Date time);




    /**


     * @Description: 查询对应城市下所有县的综合指数排名(附件7数据)


     * @Param: [regionCode, time]


     * @return: java.util.List<com.moral.api.pojo.vo.cityAQI.CityAreaRangeVO>


     * @Author: 陈凯裕


     * @Date: 2022/3/17


     */


    List<CityAreaRangeVO> cityAreaRange(Integer regionCode, Date time);






}




 screen-api/src/main/java/com/moral/api/service/CityAqiService.java


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


import com.baomidou.mybatisplus.extension.service.IService;


import com.moral.api.pojo.form.aqi.AirQualityComparisonForm;


import com.moral.api.pojo.vo.cityAQI.AirQualityComparisonVO;


import com.moral.api.pojo.vo.cityAQI.CityAreaRangeVO;




/**


 * <p>


@@ -72,11 +73,11 @@


      *@Date: 2022/3/10 15:49


     **/


    Map<String,Object> momData(Integer regionCode, Integer size, Integer current, Integer orgId);


    




    /**


      *@Description: 县市区数据


      *@Param: [regionCode]


      *@return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>> 


      *@return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>


      *@Author: lizijie


      *@Date: 2022/3/16 17:04


     **/




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


@@ -12,9 +12,11 @@


import com.moral.api.mapper.CityAqiDailyMapper;


import com.moral.api.mapper.CityAqiMonthlyMapper;


import com.moral.api.pojo.dto.cityAQI.CityPollutionLevel;


import com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent;


import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel;


import com.moral.api.pojo.dto.cityAQI.PollutionDaysAndProportion;


import com.moral.api.pojo.form.aqi.*;


import com.moral.api.pojo.vo.cityAQI.CityAreaRangeVO;


import com.moral.api.pojo.vo.cityAQI.PieChartOfPollutionLevelVO;


import com.moral.api.service.CityAqiDailyService;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


@@ -340,6 +342,91 @@


    }




    @Override


    public List<CityAreaRangeVO> cityAreaRange(Integer regionCode, Date time) {


        //判断时间是否大于昨天，大于昨天返回null


        if (DateUtils.getYesterdayDate().getTime() < time.getTime())


            return null;


        //获取城市对应所有的县级市


        List<SysArea> allAreas = sysAreaService.getChildren(regionCode);


        //获取同比时间


        Date compareTime = DateUtils.addMonths(time, -12);


        //获取指定时间的月份开始结束时间


        Date startDate = DateUtils.getFirstDayOfMonth(time);


        Date endDate = DateUtils.getLastDayOfMonth(time);


        //获取同比时间的月份开始结束时间


        Date compareStartDate = DateUtils.getFirstDayOfMonth(compareTime);


        Date compareEndDate = DateUtils.getLastDayOfMonth(compareTime);


        //创建结果集


        List<CityAreaRangeVO> vos = new ArrayList<>();


        for (SysArea area : allAreas) {


            CityAreaRangeVO vo = new CityAreaRangeVO();


            Map<String, Object> data = new HashMap<>();


            Map<String, Object> compareData = new HashMap<>();


            //获取指定时间的数据


            QueryWrapper<CityAqiDaily> wrapper = new QueryWrapper<>();


            wrapper.eq("time", time);


            wrapper.eq("city_code", area.getAreaCode());


            List<CityAqiDaily> datas = cityAqiDailyMapper.selectList(wrapper);


            if (!ObjectUtils.isEmpty(datas))


                data = JSON.parseObject(datas.get(0).getValue(), Map.class);


            //获取同比时间的数据


            QueryWrapper<CityAqiDaily> compareWrapper = new QueryWrapper<>();


            compareWrapper.eq("time", compareTime);


            compareWrapper.eq("city_code", area.getAreaCode());


            List<CityAqiDaily> compareDatas = cityAqiDailyMapper.selectList(compareWrapper);


            if (!ObjectUtils.isEmpty(compareDatas))


                compareData = JSON.parseObject(compareDatas.get(0).getValue(), Map.class);


            if (ObjectUtils.isEmpty(compareDatas) && ObjectUtils.isEmpty(datas)) {


                vos.add(vo);


                continue;


            }


            //获取6参数以及综合指数相关数据


            ConcentrationAndPercent PM25 = getConcentrationAndPercent(data.get("PM2_5"), compareData.get("PM2_5"));


            ConcentrationAndPercent PM10 = getConcentrationAndPercent(data.get("PM10"), compareData.get("PM10"));


            ConcentrationAndPercent SO2 = getConcentrationAndPercent(data.get("SO2"), compareData.get("SO2"));


            ConcentrationAndPercent NO2 = getConcentrationAndPercent(data.get("NO2"), compareData.get("NO2"));


            ConcentrationAndPercent CO = getConcentrationAndPercent(data.get("CO"), compareData.get("CO"));


            ConcentrationAndPercent O3 = getConcentrationAndPercent(data.get("O3"), compareData.get("O3"));


            ConcentrationAndPercent compositeIndex = getConcentrationAndPercent(data.get("compositeIndex"), compareData.get("compositeIndex"));


            //获取优良天气和污染天气数据


            CityPollutionLevel days = calculateDaysByTimeAndSysArea(area, startDate, endDate);


            CityPollutionLevel compareDays = calculateDaysByTimeAndSysArea(area, compareStartDate, compareEndDate);


            Integer fineDays = null;


            Integer pollutionDays = null;


            Integer compareFineDays = null;


            Integer comparePollutionDays = null;


            if (days != null) {


                fineDays = days.getExcellentWeatherDays() + days.getGoodWeatherDays();


                pollutionDays = days.getMildWeatherDays() + days.getServerWeatherDays() + days.getSeriousWeatherDays() + days.getMiddleWeatherDays();


            }


            if (compareDays != null) {


                compareFineDays = compareDays.getExcellentWeatherDays() + compareDays.getGoodWeatherDays();


                comparePollutionDays = compareDays.getMildWeatherDays() + compareDays.getServerWeatherDays() + compareDays.getSeriousWeatherDays() + compareDays.getMiddleWeatherDays();


            }


            ConcentrationAndPercent fineDaysData = getFineDaysConcentrationAndPercent(fineDays, compareFineDays);


            ConcentrationAndPercent pollutionDaysData = getFineDaysConcentrationAndPercent(pollutionDays, comparePollutionDays);


            //封装对象


            vo.setCityName(area.getAreaName());


            vo.setCompositeIndex(compositeIndex);


            vo.setPM10(PM10);


            vo.setPM25(PM25);


            vo.setNO2(NO2);


            vo.setSO2(SO2);


            vo.setO3(O3);


            vo.setCO(CO);


            vo.setFineDays(fineDaysData);


            vo.setServerDays(pollutionDaysData);


            vos.add(vo);


        }


        //对数据进行排名


        vos.sort(Comparator.comparing(value -> Double.valueOf(value.getCompositeIndex().getConcentration())));


        for(int i =1;i<vos.size()+1;i++){


            vos.get(i-1).setRange(i);


        }


        return vos;


    }




    @Override


    public List<CityPollutionLevel> queryProvinceCitiesPollutionLevel(ProvinceCitiesPollutionLevelForm form) {


        //取参


        Date startDate = form.getStartDate();


@@ -429,15 +516,15 @@


            return null;


        //获取第二段文字


        List<String> paragraphTwoAndFour = getParagraphTwoAndFour(year + "", month + "", day + "", regionCode, time);


        if(paragraphTwoAndFour==null)


        if (paragraphTwoAndFour == null)


            return null;


        String paragraphTwo =  paragraphTwoAndFour.get(0);


        String paragraphTwo = paragraphTwoAndFour.get(0);


        //获取简报第三段文字


        String paragraphThree = getParagraphThree(month + "", day + "", regionCode, time);


        if (paragraphThree == null)


            return null;


        //获取第四段文字


        String paragraphFour =  paragraphTwoAndFour.get(1);


        String paragraphFour = paragraphTwoAndFour.get(1);


        result.add(title);


        result.add(paragraphOne);


        result.add(paragraphTwo);


@@ -491,7 +578,7 @@


        CityPollutionLevel days = calculateDaysByTimeAndSysArea(area, startTime, endTime);


        //查询对比年度优良天气


        CityPollutionLevel compareDays = calculateDaysByTimeAndSysArea(area, compareStartTime, compareEndTime);


        if(days==null||compareDays==null)


        if (days == null || compareDays == null)


            return null;


        //查询年度数据


        List<CityAqiYearly> yearDataList = cityAqiYearlyService.getCityAqiYearlyByRegionCodeAndTime(Integer.parseInt(regionCode), startTime, endTime);


@@ -505,7 +592,7 @@


        //封装第二段信息


        String yearPM_5 = dataMap.get("PM2_5").toString();


        String fineDays = days.getExcellentWeatherDays() + days.getGoodWeatherDays() + "";


        int allDays = DateUtils.getDays(startTime, endTime)+1;


        int allDays = DateUtils.getDays(startTime, endTime) + 1;


        paragraphTwo = paragraphTwo.replace("{year}", year);


        paragraphTwo = paragraphTwo.replace("{yearPM2.5}", yearPM_5);


        paragraphTwo = paragraphTwo.replace("{fineDays}", fineDays);


@@ -541,7 +628,7 @@


        //获取年度污染天数


        int yearPollutionDays = days.getMildWeatherDays() + days.getMiddleWeatherDays() + days.getSeriousWeatherDays() + days.getServerWeatherDays();


        //获取年度优良天气占比


        String yearFineDaysPer = String.valueOf(MathUtils.division(yearFineDays*100 ,allDays,2));


        String yearFineDaysPer = String.valueOf(MathUtils.division(yearFineDays * 100, allDays, 2));




        //获取168城市综合指数排名和综合指数变化率排名


        List<Integer> oneSixEightRanges = rangeByCities(compositeIndex,


@@ -560,35 +647,35 @@


        String compositeIndex168range = oneSixEightRanges.get(0).toString();


        String compositeIndexPer168range = oneSixEightRanges.get(1).toString();


        //封装返回信息


        paragraphFour = paragraphFour.replace("{month}",month);


        paragraphFour = paragraphFour.replace("{day}",day);


        paragraphFour = paragraphFour.replace("{yearCompositeIndex}",compositeIndex+"");


        paragraphFour = paragraphFour.replace("{yoyYearCompositeIndex}",yoyYearCompositeIndex);


        paragraphFour = paragraphFour.replace("{yoyYearCompositeIndexUpDown}",yoyYearCompositeIndexUpDown);


        paragraphFour = paragraphFour.replace("{yearPM2.5}",PM2_5+"");


        paragraphFour = paragraphFour.replace("{yoyYearPM2.5UpDown}",yoyYearPM2_5UpDown);


        paragraphFour = paragraphFour.replace("{yoyYearPM2.5}",yoyYearPM2_5);


        paragraphFour = paragraphFour.replace("{yearFineDays}",yearFineDays+"");


        paragraphFour = paragraphFour.replace("{yearFineDaysPer}",yearFineDaysPer);


        paragraphFour = paragraphFour.replace("{yearPollutionDays}",yearPollutionDays+"");


        paragraphFour = paragraphFour.replace("{yoyYearFineDaysUpDown}",yoyYearFineDaysUpDown);


        paragraphFour = paragraphFour.replace("{yoyYearFineDays}",yoyYearFineDays);


        paragraphFour = paragraphFour.replace("{compositeIndex28range}",compositeIndex28range);


        paragraphFour = paragraphFour.replace("{compositeIndexPer28range}",compositeIndexPer28range);


        paragraphFour = paragraphFour.replace("{compositeIndex168range}",compositeIndex168range);


        paragraphFour = paragraphFour.replace("{compositeIndexPer168range}",compositeIndexPer168range);


        paragraphFour = paragraphFour.replace("{month}", month);


        paragraphFour = paragraphFour.replace("{day}", day);


        paragraphFour = paragraphFour.replace("{yearCompositeIndex}", compositeIndex + "");


        paragraphFour = paragraphFour.replace("{yoyYearCompositeIndex}", yoyYearCompositeIndex);


        paragraphFour = paragraphFour.replace("{yoyYearCompositeIndexUpDown}", yoyYearCompositeIndexUpDown);


        paragraphFour = paragraphFour.replace("{yearPM2.5}", PM2_5 + "");


        paragraphFour = paragraphFour.replace("{yoyYearPM2.5UpDown}", yoyYearPM2_5UpDown);


        paragraphFour = paragraphFour.replace("{yoyYearPM2.5}", yoyYearPM2_5);


        paragraphFour = paragraphFour.replace("{yearFineDays}", yearFineDays + "");


        paragraphFour = paragraphFour.replace("{yearFineDaysPer}", yearFineDaysPer);


        paragraphFour = paragraphFour.replace("{yearPollutionDays}", yearPollutionDays + "");


        paragraphFour = paragraphFour.replace("{yoyYearFineDaysUpDown}", yoyYearFineDaysUpDown);


        paragraphFour = paragraphFour.replace("{yoyYearFineDays}", yoyYearFineDays);


        paragraphFour = paragraphFour.replace("{compositeIndex28range}", compositeIndex28range);


        paragraphFour = paragraphFour.replace("{compositeIndexPer28range}", compositeIndexPer28range);


        paragraphFour = paragraphFour.replace("{compositeIndex168range}", compositeIndex168range);


        paragraphFour = paragraphFour.replace("{compositeIndexPer168range}", compositeIndexPer168range);


        result.add(paragraphFour);


        return result;


    }




    //获取城市综合指数和综合指数变化率排名


    private List<Integer> rangeByCities(


                         Double compositeIndex,


                         Double compositeIndexPer,


                         Date startTime,


                         Date endTime,


                         Date compareStartTime,


                         Date compareEndTime, List<SysArea> areas){


            Double compositeIndex,


            Double compositeIndexPer,


            Date startTime,


            Date endTime,


            Date compareStartTime,


            Date compareEndTime, List<SysArea> areas) {


        List<Double> compositeIndexList = new ArrayList<>();


        List<Double> compositePerList = new ArrayList<>();


        for (SysArea sysArea : areas) {


@@ -596,21 +683,21 @@


            List<CityAqiYearly> data = cityAqiYearlyService.getCityAqiYearlyByRegionCodeAndTime(sysArea.getAreaCode(), startTime, endTime);


            //获取对比数据


            List<CityAqiYearly> compareData = cityAqiYearlyService.getCityAqiYearlyByRegionCodeAndTime(sysArea.getAreaCode(), compareStartTime, compareEndTime);


            if(ObjectUtils.isEmpty(data)||ObjectUtils.isEmpty(compareData))


            if (ObjectUtils.isEmpty(data) || ObjectUtils.isEmpty(compareData))


                continue;


            Map<String,Object> dataMap = JSON.parseObject(data.get(0).getValue(),Map.class);


            Map<String,Object> compareDataMap = JSON.parseObject(compareData.get(0).getValue(),Map.class);


            Map<String, Object> dataMap = JSON.parseObject(data.get(0).getValue(), Map.class);


            Map<String, Object> compareDataMap = JSON.parseObject(compareData.get(0).getValue(), Map.class);


            //获取综合指数


            compositeIndexList.add(Double.valueOf(dataMap.get("compositeIndex").toString()));


            //计算综合指数变化率


            Double per = calculateCompare(Double.valueOf(dataMap.get("compositeIndex").toString()),Double.valueOf(compareDataMap.get("compositeIndex").toString()));


            Double per = calculateCompare(Double.valueOf(dataMap.get("compositeIndex").toString()), Double.valueOf(compareDataMap.get("compositeIndex").toString()));


            compositePerList.add(per);


        }


        Collections.sort(compositeIndexList);


        Collections.sort(compositePerList);


        Integer compositeIndexRange = compositeIndexList.indexOf(compositeIndex);


        Integer compositePerRange = compositePerList.indexOf(compositeIndexPer);


        return Arrays.asList((compositeIndexRange+1),(compositePerRange+1));


        return Arrays.asList((compositeIndexRange + 1), (compositePerRange + 1));


    }




    //获取简报第三段信息


@@ -694,14 +781,35 @@


    //计算同比上升/下降比例 公式（当前数据-同比数据）/同比数据 只返回正数


    private Double calculateComparePerPositive(Double currentData, Double compareData) {


        double tmp1 = MathUtils.sub(currentData, compareData);


        double result = MathUtils.mul(MathUtils.division(tmp1, compareData, 4),100d);


        double result = MathUtils.mul(MathUtils.division(tmp1, compareData, 4), 100d);


        return result > 0 ? result : MathUtils.mul(result, -1d);


    }




    //计算同比上升/下降比例 公式（当前数据-同比数据）/同比数据 只返回正数


    //计算同比上升/下降比例 公式（当前数据-同比数据）/同比数据


    private Double calculateCompare(Double currentData, Double compareData) {


        double tmp1 = MathUtils.sub(currentData, compareData);


        return MathUtils.mul(MathUtils.division(tmp1, compareData, 4),100d);


        return MathUtils.mul(MathUtils.division(tmp1, compareData, 4), 100d);


    }






    //获取六参以及综合指数的指数 同比浓度 以及同比


    private ConcentrationAndPercent getConcentrationAndPercent(Object data, Object compareData) {


        ConcentrationAndPercent cap = new ConcentrationAndPercent();


        cap.setConcentration(data != null ? data.toString() : "-");


        cap.setCompareConcentration(compareData != null ? compareData.toString() : "-");


        if (data != null && compareData != null)


            cap.setPercent(calculateCompare(Double.valueOf(data.toString()), Double.valueOf(compareData.toString())) + "%");


        else


            cap.setPercent("-");


        return cap;


    }




    //获取污染天气和优良天的天数和同比


    private ConcentrationAndPercent getFineDaysConcentrationAndPercent(Integer days, Integer compareDays) {


        ConcentrationAndPercent cap = new ConcentrationAndPercent();


        cap.setConcentration(days != null ? days + "天" : "-");


        cap.setPercent(compareDays != null ? (days - compareDays) + "天" : "-");


        return cap;


    }








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


@@ -14,6 +14,7 @@


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;


@@ -83,6 +84,9 @@




    @Autowired


    private HistoryHourlyService historyHourlyService;




    @Autowired


    SpecialCitiesProperties citiesProperties;




    @Autowired


    private SysAreaMapper sysAreaMapper;


@@ -372,7 +376,7 @@


                }


            });




            //今日累计O3_8H计算,取每小时O3_8H最大值


            //今日累计O3_8H计算,取每小时O3——8H最大值


            if (!ObjectUtils.isEmpty(doubles)) {


                dataMap.put("O3_8H", Collections.max(doubles));


            }


@@ -634,7 +638,7 @@


    /**


     * @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


     */


@@ -1191,15 +1195,15 @@


     */


    private ConcentrationAndPercent contrastParam(Double data, Double comparisonData, String sensor) {


        double percentD = MathUtils.division(data - comparisonData, comparisonData, 4);


        String percent = MathUtils.mul(percentD, 100d) + "%";


        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")) {


        }else if (sensor.equals("compositeIndex")){


            concentrationAndPercent.setConcentration(data.toString());


        } else {


        }else{


            Double sensorD = AmendUtils.sciCal(data, 0);


            Integer sensorI = new Double(sensorD).intValue();


            concentrationAndPercent.setConcentration(sensorI.toString());


@@ -1225,7 +1229,7 @@


    /**


     * @Description: 根据时间类型查询对应的6参以及综合指数，自定义时间类型用日数据做均值处理


     * @Param: [comparisonType, startDate, endDate, regionCode]


     * @return: java.util.Map<java.lang.String, java.lang.Object>


     * @return: java.util.Map<java.lang.String                                                               ,                                                               java.lang.Object>


     * @Author: 陈凯裕


     * @Date: 2022/1/17


     */


@@ -1309,8 +1313,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);


        }


@@ -1320,7 +1323,7 @@


    /**


     * @Description: 计算6参平均值


     * @Param: [cityAqiList]


     * @return: java.util.Map<java.lang.String, java.lang.Double>


     * @return: java.util.Map<java.lang.String                                                               ,                                                                                                                               java.lang.Double>


     * 返回值key为sensorCode,value为值


     * @Author: 陈凯裕


     * @Date: 2021/11/2




 screen-job/src/main/java/com/moral/api/service/CityAqiMonthlyService.java


@@ -12,7 +12,6 @@


 * @since 2021-11-04


 */


public interface CityAqiMonthlyService extends IService<CityAqiMonthly> {




    //城市aqi月数据统计


    void insertCityAqiMonthly();






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


@@ -182,6 +182,7 @@


        cityAqiMonthlyMapper.insertCityAqiMonthly(cityAqiMonthlyList);


    }






    /**


     * @param thisMonthOfLastYearData 去年本月数据


     * @param currentData             当前月该数据