fix：臭氧预测功能开发

cjl

2024-04-02 45199ae5da5ca4bcfae8d61fb97f1780e1305dcf

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

@@ -8,19 +8,15 @@
import com.moral.api.service.CityAqiDailyService;

import com.moral.api.service.CityAqiYearlyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Required;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.*;
import java.util.stream.Collectors;

import javax.servlet.http.HttpServletRequest;
import javax.validation.constraints.NotNull;
@@ -29,7 +25,6 @@
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;
import sun.security.util.Resources_sv;

@RestController
@RequestMapping("/aqi")
@@ -58,6 +53,30 @@
        }
        List<Map<String, Object>> response = cityAqiService.measuredCompareForecastOfO3(params);
        return ResultMessage.ok(response);
    }

    @GetMapping("compareO3New")
    @ApiOperation(value = "预测和实测臭氧对比New", notes = "预测和实测臭氧对比New")
    public ResultMessage compareO3New(@RequestParam @ApiParam(value = "城市code",name = "regionCode") String regionCode,
                                      @RequestParam @ApiParam(value = "日期",name = "time") String time) {
        Map<String, Object> params = new HashMap<>();
        params.put("regionCode",regionCode);
        params.put("time",time);
        List<Map<String, Object>> response = cityAqiService.measuredCompareForecastOfO3(params);
        Map<Integer, List<Map<String, Object>>> groupMap = response.stream().collect(Collectors.groupingBy(it->it.get("type").toString().equals("实测")?0:1));
        return ResultMessage.ok(groupMap);
    }

    @GetMapping("getO38H")
    @ApiOperation(value = "预测和实测臭氧8小时对比New", notes = "预测和实测臭氧8小时对比New")
    public ResultMessage getO38H(@RequestParam @ApiParam(value = "城市code",name = "regionCode") String regionCode,
                                      @RequestParam @ApiParam(value = "日期",name = "time") String time) {
        Map<String, Object> params = new HashMap<>();
        params.put("regionCode",regionCode);
        params.put("time",time);
        List<Map<String, Object>> response = cityAqiService.measuredCompareForecastOfO3_8H(params);
        Map<Integer, List<Map<String, Object>>> groupMap = response.stream().collect(Collectors.groupingBy(it->it.get("type").toString().equals("实测")?0:1));
        return ResultMessage.ok(groupMap);
    }

    /**
@@ -315,4 +334,38 @@
        return  ResultMessage.ok(result);
    }

    /**
    * @Description: 查询市内所有县的排名 附件7
            * @Param: [regionCode, time]
            * @return: com.moral.constant.ResultMessage
            * @Author: 陈凯裕
            * @Date: 2022/3/16
            */
    @GetMapping("cityAreaRange")
    public ResultMessage cityAreaRange(Integer regionCode,@DateTimeFormat(pattern = "yyyy-MM-dd") Date time){
        if(regionCode==null || time==null){
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        List<CityAreaRangeVO> vos = cityAqiDailyService.cityAreaRange(regionCode,time);
        return ResultMessage.ok(vos);
    }

    /**
      *@Description: 县市区数据
      *@Param: [regionCode]
      *@return: com.moral.constant.ResultMessage 
      *@Author: lizijie
      *@Date: 2022/3/16 16:54
     **/
    @GetMapping("countyData")
    public ResultMessage countyData(Integer regionCode){
        if(regionCode==null){
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Map<String, Object> resultMap = cityAqiService.countyData(regionCode);
        return  ResultMessage.ok(resultMap);
    }

}