jinpengyong
2021-11-12 c85d78a46c7f4287b587d5f71c1d81b52d2e0cad
screen-api/src/main/java/com/moral/api/controller/AqiController.java
@@ -3,6 +3,7 @@
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;
@@ -109,19 +110,20 @@
    @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"),
@@ -130,7 +132,7 @@
    })
    public ResultMessage rankingDetails(HttpServletRequest request) {
        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
        if (!params.containsKey("type") || !params.containsKey("cityType")) {
        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");