fix：臭氧预测功能开发

cjl

2024-04-02 45199ae5da5ca4bcfae8d61fb97f1780e1305dcf

fix：臭氧预测功能开发

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

@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.*;

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

import javax.servlet.http.HttpServletRequest;
import javax.validation.constraints.NotNull;
@@ -56,24 +57,26 @@

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

    /**

 screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java

@@ -1463,6 +1463,8 @@
                }
            }
            if (value.size() < 6) {
                map.put("time",times);
                list.add(map);
                continue;
            }
            double average = value.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage();