screen-api

kaiyu

2022-03-24 a827480e5e74cb6550c5f7b842bccac3023c5bdc

screen-api

 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>

 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;
@@ -337,6 +339,91 @@
            datas.add(cityPollutionLevel);
        }
        return datas;
    }

    @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
@@ -698,12 +785,33 @@
        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);
    }


    //获取六参以及综合指数的指数 同比浓度 以及同比
    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));
            }
@@ -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);
        }

 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             当前月该数据