jinpengyong
2022-01-05 2bd766940afdcb30d63840cea251d3979b332254
2+26城市排名
3 files modified
215 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/AqiController.java 2 ●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java 211 ●●●●● patch | view | raw | blame | history
screen-api/src/main/resources/application-specialCity.yml 2 ●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/AqiController.java
@@ -177,7 +177,7 @@
            @ApiImplicitParam(name = "time", value = "时间,排名类型为day,month,year是需传此参", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "start", value = "开始时间,排名类型为custom自定义是传此参,精确到日,如:2021-11-02", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "end", value = "结束时间,排名类型为custom自定义是传此参,精确到日,如:2021-11-03", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "cityType", value = "城市类型,省内城市:province,市区排名:city", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "cityType", value = "城市类型,省内城市:province,市区排名:city,2+28城市排名:28", required = true, paramType = "query", dataType = "String"),
    })
    public ResultMessage rankingDetails(HttpServletRequest request) {
        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -3,6 +3,7 @@
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;
@@ -60,9 +61,6 @@
    private RedisTemplate redisTemplate;
    @Autowired
    private OrganizationService organizationService;
    @Autowired
    private SysAreaService sysAreaService;
    @Autowired
@@ -73,6 +71,9 @@
    @Autowired
    private CityAqiYearlyService cityAqiYearlyService;
    @Autowired
    private SpecialCitiesProperties specialCitiesProperties;
    @Override
    public List<Map<String, Object>> measuredCompareForecastOfO3(Map<String, Object> params) {
@@ -146,7 +147,7 @@
                value = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.CITY_AQI, String.valueOf(regionCode));
                if (value == null)
                    value = queryCityAqiByRegionCodeFromDB(regionCode);
            }else{
            } else {
                return null;
            }
        }
@@ -167,7 +168,7 @@
        lastDataWrapper.orderByDesc("time");
        lastDataWrapper.last(true, "limit 1");
        CityAqi cityAqi = cityAqiMapper.selectOne(lastDataWrapper);
        if(cityAqi==null)
        if (cityAqi == null)
            return null;
        //算出前24小时的时间点
        Date endDate = cityAqi.getTime();
@@ -260,39 +261,46 @@
        Integer curCityCode = Integer.parseInt(s.substring(0, 4) + "00");
        QueryWrapper<SysArea> areaWrapper = new QueryWrapper<>();
        if ("province".equals(cityType)) {
            //获取省内所有市
            areaWrapper.select("area_code").eq("parent_code", curProvinceCode);
        List<SysArea> sysAreas;
        if ("28".equals(cityType)) {
            //获取2+26城市
            sysAreas = specialCitiesProperties.getTwentyEightCities();
        } else {
            //获取市内所有县区
            areaWrapper.select("area_code").eq("parent_code", curCityCode);
            if ("province".equals(cityType)) {
                //获取省内所有市
                areaWrapper.select("area_code").eq("parent_code", curProvinceCode);
            } else {
                //获取市内所有县区
                areaWrapper.select("area_code").eq("parent_code", curCityCode);
            }
            sysAreas = sysAreaService.list(areaWrapper);
        }
        List<Object> regionCodes = sysAreaService.listObjs(areaWrapper);
        switch (type) {
            case "today":
                result = accumulatedTodayRank(regionCodes);
                result = accumulatedTodayRank(sysAreas);
                break;
            case "hour":
                time = new StringBuilder(time).replace(10, 11, " ").toString() + ":00:00";
                result = hourRank(regionCodes, time);
                result = hourRank(sysAreas, time);
                break;
            case "day":
                time = time + " 00:00:00";
                result = dayRank(regionCodes, time);
                result = dayRank(sysAreas, time);
                break;
            case "month":
                time = time + "-01 00:00:00";
                result = monthRank(regionCodes, time);
                result = monthRank(sysAreas, time);
                break;
            case "year":
                time = time + "-01-01 00:00:00";
                result = yearRank(regionCodes, time);
                result = yearRank(sysAreas, time);
                break;
            case "custom":
                start = start + " 00:00:00";
                end = end + " :00:00";
                result = customRank(regionCodes, start, end);
                result = customRank(sysAreas, start, end);
                break;
            default:
                break;
@@ -301,10 +309,14 @@
    }
    /**
     * @param regionCodes 所要获取城市的地去编程集合
     * @param sysAreas 所要获取城市集合
     * @return 功能:今日累计排名
     */
    private List<Map<String, Object>> accumulatedTodayRank(List<Object> regionCodes) {
    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();
@@ -315,7 +327,7 @@
                .in("city_code", regionCodes);
        List<Map<String, Object>> cumulativeData = cityAqiMapper.selectMaps(wrapper);
        //按city_code分组
        Map<String, List<Map<String, Object>>> data = cumulativeData.parallelStream().collect(Collectors.groupingBy(o -> o.get("city_code").toString()));
        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) {
@@ -377,22 +389,27 @@
            dataMap.put("compositeIndex", compositeIndex);
            //城市名
            QueryWrapper<SysArea> queryWrapper = new QueryWrapper<>();
            queryWrapper.select("area_name").eq("area_code", cityCode);
            String areaName = sysAreaService.getOne(queryWrapper).getAreaName();
            dataMap.put("cityName", areaName);
            for (SysArea sysArea : sysAreas) {
                if (cityCode.equals(sysArea.getAreaCode())) {
                    dataMap.put("cityName", sysArea.getAreaName());
                    break;
                }
            }
            result.add(dataMap);
        });
        return result;
    }
    /**
     * @param regionCodes 所要获取城市的编码集合
     * @param time        所要获取数据的时间 2021-11-04 13:00:00
     * @param sysAreas 所要获取城市集合
     * @param time     所要获取数据的时间 2021-11-04 13:00:00
     * @return 功能:小时排名
     */
    private List<Map<String, Object>> hourRank(List<Object> regionCodes, String time) {
    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")
@@ -415,11 +432,15 @@
    }
    /**
     * @param regionCodes 所要获取城市的编码集合
     * @param time        所要获取数据的时间 2021-11-04 00:00:00
     * @param sysAreas 所要获取城市集合
     * @param time     所要获取数据的时间 2021-11-04 00:00:00
     * @return 功能:日排名
     */
    private List<Map<String, Object>> dayRank(List<Object> regionCodes, String time) {
    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")
@@ -434,30 +455,37 @@
                primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));
            }
            value.put("primaryPollutant", primaryPollutant);
            //城市名
            QueryWrapper<SysArea> queryWrapper = new QueryWrapper<>();
            queryWrapper.select("area_name")
                    .eq("area_code", dayDatum.get("city_code"));
            String areaName = sysAreaService.getOne(queryWrapper).getAreaName();
            value.put("cityName", areaName);
            for (SysArea sysArea : sysAreas) {
                if (dayDatum.get("city_code").equals(sysArea.getAreaCode())) {
                    value.put("cityName", sysArea.getAreaName());
                    break;
                }
            }
            result.add(value);
        }
        return result;
    }
    /**
     * @param regionCodes 所要获取城市的编码集合
     * @param time        所要获取数据的时间 2021-11-01 00:00:00 每月1号
     * @param sysAreas 所要获取城市集合
     * @param time     所要获取数据的时间 2021-11-01 00:00:00 每月1号
     * @return 功能:月排名
     */
    private List<Map<String, Object>> monthRank(List<Object> regionCodes, String time) {
    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获取
        //如果部是本月,实时计算,其他直接从city_aqi_monthly获取
        if (!time.substring(0, 7).equals(DateUtils.dateToDateString(new Date(), DateUtils.yyyy_MM_EN))) {
            QueryWrapper<CityAqiMonthly> cityAqiMonthlyQueryWrapper = new QueryWrapper<>();
            for (Object regionCode : regionCodes) {
            for (Integer regionCode : regionCodes) {
                cityAqiMonthlyQueryWrapper.clear();
                cityAqiMonthlyQueryWrapper.select("value")
                        .eq("city_code", regionCode)
@@ -468,13 +496,15 @@
                }
                String value = cityAqiMonthly.getValue();
                Map<String, Object> resultMap = JSONObject.parseObject(value, Map.class);
                //城市名
                QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>();
                sysAreaQueryWrapper.select("area_name")
                        .eq("area_code", regionCode);
                String areaName = sysAreaService.getOne(sysAreaQueryWrapper).getAreaName();
                resultMap.put("cityName", areaName);
                result.add(resultMap);
                for (SysArea sysArea : sysAreas) {
                    if (regionCode.equals(sysArea.getAreaCode())) {
                        resultMap.put("cityName", sysArea.getAreaName());
                        break;
                    }
                }
            }
            return result;
        }
@@ -485,7 +515,9 @@
                .in("city_code", regionCodes);
        List<Map<String, Object>> thisMonthData = cityAqiDailyService.listMaps(cityAqiDailyQueryWrapper);
        //按city_code分组
        Map<String, List<Map<String, Object>>> thisMonthMap = thisMonthData.parallelStream().collect(Collectors.groupingBy(o -> o.get("city_code").toString()));
        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<>();
@@ -556,30 +588,34 @@
            resultMap.put("monthContrast", monthContrast);
            //城市名
            QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>();
            sysAreaQueryWrapper.select("area_name")
                    .eq("area_code", cityCode);
            String areaName = sysAreaService.getOne(sysAreaQueryWrapper).getAreaName();
            resultMap.put("cityName", areaName);
            for (SysArea sysArea : sysAreas) {
                if (cityCode.equals(sysArea.getAreaCode())) {
                    resultMap.put("cityName", sysArea.getAreaName());
                    break;
                }
            }
            result.add(resultMap);
        });
        return result;
    }
    /**
     * @param regionCodes 所要获取城市的编码集合
     * @param time        所要获取数据的时间 2021-11-01 00:00:00 每年1月1号
     * @param sysAreas 所要获取城市集合
     * @param time     所要获取数据的时间 2021-11-01 00:00:00 每年1月1号
     * @return 功能:年排名
     */
    private List<Map<String, Object>> yearRank(List<Object> regionCodes, String time) {
    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 (Object regionCode : regionCodes) {
            for (Integer regionCode : regionCodes) {
                cityAqiYearlyQueryWrapper.clear();
                cityAqiYearlyQueryWrapper.select("value")
                        .eq("city_code", regionCode)
@@ -590,12 +626,15 @@
                }
                String value = cityAqiYearly.getValue();
                Map<String, Object> resultMap = JSONObject.parseObject(value, Map.class);
                //城市名
                QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>();
                sysAreaQueryWrapper.select("area_name")
                        .eq("area_code", regionCode);
                String areaName = sysAreaService.getOne(sysAreaQueryWrapper).getAreaName();
                resultMap.put("cityName", areaName);
                for (SysArea sysArea : sysAreas) {
                    if (regionCode.equals(sysArea.getAreaCode())) {
                        resultMap.put("cityName", sysArea.getAreaName());
                        break;
                    }
                }
                result.add(resultMap);
            }
            return result;
@@ -607,7 +646,8 @@
                .in("city_code", regionCodes);
        List<Map<String, Object>> thisMonthData = cityAqiDailyService.listMaps(cityAqiDailyQueryWrapper);
        //按city_code分组
        Map<String, List<Map<String, Object>>> thisYearMap = thisMonthData.parallelStream().collect(Collectors.groupingBy(o -> o.get("city_code").toString()));
        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<>();
@@ -676,24 +716,31 @@
                yearContrast = decimalFormat.format((compositeIndex - lastCompositeIndex) / lastCompositeIndex);
            }
            resultMap.put("yearContrast", yearContrast);
            //城市名
            QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>();
            sysAreaQueryWrapper.select("area_name").eq("area_code", cityCode);
            String areaName = sysAreaService.getOne(sysAreaQueryWrapper).getAreaName();
            resultMap.put("cityName", areaName);
            //城市名
            for (SysArea sysArea : sysAreas) {
                if (cityCode.equals(sysArea.getAreaCode())) {
                    resultMap.put("cityName", sysArea.getAreaName());
                    break;
                }
            }
            result.add(resultMap);
        });
        return result;
    }
    /**
     * @param regionCodes 所要获取城市的编码集合
     * @param start       所要获取数据的开始时间,精确到日,2021-11-03 00:00:00
     * @param end         所要获取数据的结束时间,精确到日,2021-11-25 00:00:00
     * @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<Object> regionCodes, String start, String end) {
    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<>();
@@ -704,7 +751,8 @@
                .in("city_code", regionCodes);
        List<Map<String, Object>> thisMonthData = cityAqiDailyService.listMaps(cityAqiDailyQueryWrapper);
        //按city_code分组
        Map<String, List<Map<String, Object>>> customMap = thisMonthData.parallelStream().collect(Collectors.groupingBy(o -> o.get("city_code").toString()));
        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<>();
@@ -758,11 +806,12 @@
            resultMap.put("O3_8H", resultMap.remove("O3"));
            //城市名
            QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>();
            sysAreaQueryWrapper.select("area_name").eq("area_code", cityCode);
            String areaName = sysAreaService.getOne(sysAreaQueryWrapper).getAreaName();
            resultMap.put("cityName", areaName);
            for (SysArea sysArea : sysAreas) {
                if (cityCode.equals(sysArea.getAreaCode())) {
                    resultMap.put("cityName", sysArea.getAreaName());
                    break;
                }
            }
            result.add(resultMap);
        });
        return result;
@@ -771,7 +820,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
@@ -825,7 +874,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
     */
screen-api/src/main/resources/application-specialCity.yml
@@ -36,7 +36,7 @@
      areaName: 开封市
    - areaCode: 410900
      areaName: 濮阳市
    - areaCode: 410000
    - areaCode: 410100
      areaName: 郑州市
    - areaCode: 371400
      areaName: 德州市