省内排名和排名详情接口变更，根据regionCode获取数据

jinpengyong

2021-11-12 c85d78a46c7f4287b587d5f71c1d81b52d2e0cad

 screen-api/src/main/java/com/moral/api/controller/AqiController.java

@@ -1,5 +1,9 @@
package com.moral.api.controller;

import com.moral.api.pojo.dto.dataDisplay.PieChartOfPollutionLevelDTO;
import com.moral.api.pojo.form.aqi.QueryPieChartOfPollutionLevelForm;
import com.moral.api.service.CityAqiDailyService;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -11,8 +15,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -31,6 +33,8 @@

    @Autowired
    private CityAqiService cityAqiService;
    @Autowired
    private CityAqiDailyService cityAqiDailyService;

    @GetMapping("compareO3")
    @ApiOperation(value = "预测和实测臭氧对比", notes = "预测和实测臭氧对比")
@@ -73,85 +77,76 @@
    }

    /**
    * @Description: 查询当天的累计aqi以及主要污染物
            * @Param: [RegionCode]
            * @return: com.moral.constant.ResultMessage
            * @Author: 陈凯裕
            * @Date: 2021/11/2
            */
     * @Description: 查询当天的累计aqi以及主要污染物
     * @Param: [RegionCode]
     * @return: com.moral.constant.ResultMessage
     * @Author: 陈凯裕
     * @Date: 2021/11/2
     */
    @GetMapping("queryTodayAqiAndPollutant")
    public ResultMessage queryTodayAqiAndPollutant(Integer regionCode){
    public ResultMessage queryTodayAqiAndPollutant(Integer regionCode) {
        Map<String, Object> datas = cityAqiService.queryTodayAqiAndPollutant(regionCode);
        return ResultMessage.ok(datas);
    }

    /**
     * @Description: 首页右下角，污染天数占比的饼状图
     * @Param: [regionCode]
     * @return: com.moral.constant.ResultMessage
     * @Author: 陈凯裕
     * @Date: 2021/11/11
     */
    @GetMapping("queryPieChartOfPollutionLevel")
    public ResultMessage queryPieChartOfPollutionLevel(QueryPieChartOfPollutionLevelForm form) {
        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());

        PieChartOfPollutionLevelDTO dto = cityAqiDailyService.queryPieChartOfPollutionLevels(form);
        return ResultMessage.ok(dto);
    }

    @GetMapping("provincialRanking")
    @ApiOperation(value = "省内排名", notes = "省内排名")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "organizationId", value = "组织id", required = true, paramType = "query", dataType = "Integer")
            @ApiImplicitParam(name = "regionCode", value = "区号", required = true, paramType = "query", dataType = "Integer")
    })
    public ResultMessage provincialRanking(Integer organizationId) {
        if (ObjectUtils.isEmpty(organizationId)) {
    public ResultMessage provincialRanking(Integer regionCode) {
        if (ObjectUtils.isEmpty(regionCode)) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Map<String, Object> response = cityAqiService.provincialRanking(organizationId);
        Map<String, Object> response = cityAqiService.provincialRanking(regionCode);
        return ResultMessage.ok(response);
    }

    @GetMapping("rankingDetails")
    @ApiOperation(value = "排名详情", notes = "排名详情")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "regionCode", value = "区号", required = true, paramType = "query", dataType = "Integer"),
            @ApiImplicitParam(name = "type", value = "排名类型，今日累计：today，小时：hour，日：day，月：month，年：year，自定义：custom", required = true, paramType = "query", dataType = "String"),
            @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"),
    })
    public ResultMessage rankingDetails() {
        List<Map<String, Object>> response = new ArrayList<>();
        Map<String, Object> map1 = new HashMap<>();
        map1.put("rank", 1);
        map1.put("cityName", "邯郸");
        map1.put("aqi", 75);
        map1.put("compositeIndex", 4.23);
        map1.put("pm2_5", 55);
        map1.put("pm10", 74);
        map1.put("so2", 12);
        map1.put("no2", 46);
        map1.put("co", 0.6);
        map1.put("o3", 19);
        map1.put("o3_8h", 18);
        map1.put("primary", "o3");


        Map<String, Object> map2 = new HashMap<>();
        map2.put("rank", 2);
        map2.put("cityName", "沧州");
        map2.put("aqi", 72);
        map2.put("compositeIndex", 3.20);
        map2.put("pm2_5", 65);
        map2.put("pm10", 89);
        map2.put("so2", 23);
        map2.put("no2", 65);
        map2.put("co", 0.3);
        map2.put("o3", 23);
        map2.put("o3_8h", 24);
        map2.put("primary", "pm10");

        Map<String, Object> map3 = new HashMap<>();
        map3.put("rank", 3);
        map3.put("cityName", "保定");
        map3.put("aqi", 68);
        map3.put("compositeIndex", 3.56);
        map3.put("pm2_5", 56);
        map3.put("pm10", 62);
        map3.put("so2", 65);
        map3.put("no2", 54);
        map3.put("co", 0.6);
        map3.put("o3", 36);
        map3.put("o3_8h", 30);
        map3.put("primary", "so2");
        response.add(map1);
        response.add(map2);
        response.add(map3);



    public ResultMessage rankingDetails(HttpServletRequest request) {
        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
        if (!params.containsKey("type") || !params.containsKey("cityType") || !params.containsKey("regionCode")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Object type = params.get("type");
        if ("hour".equals(type) || "day".equals(type) || "month".equals(type) || "year".equals(type)) {
            if (!params.containsKey("time")) {
                return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
            }
        }
        if ("custom".equals(type)) {
            if (!params.containsKey("start") || !params.containsKey("end")) {
                return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
            }
        }
        List<Map<String, Object>> response = cityAqiService.rankingDetails(params);
        return ResultMessage.ok(response);
    }
}