fix:站点数据问题修复

cjl

2023-08-15 c85080a9c279f3de706bdb0c13163e95bbf3bcdd

fix:站点数据问题修复

 screen-job/src/main/java/com/moral/api/controller/PubController.java

@@ -34,6 +34,9 @@
    private HistoryDailyService historyDailyService;
    @Autowired
    private HistoryFiveMinutelyService historyFiveMinutelyService;

    @Autowired
    private CityWeatherService cityWeatherService;
    @Autowired
    private ForecastService forecastService;

@@ -85,6 +88,12 @@
        forecastService.forecastO3();
        return new ResultMessage();
    }
    @GetMapping("insertCityWeather")
    @ApiOperation(value = "获取天气小时数据", notes = "获取天气小时数据")
    public ResultMessage insertCityWeather() {
        cityWeatherService.insertCityWeather();
        return new ResultMessage();
    }


    public static void main(String[] args) {

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

@@ -22,12 +22,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.OptionalDouble;
import java.util.*;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.DoubleStream;
@@ -136,7 +131,7 @@
            Integer cityCode = Integer.parseInt(obj.toString());

            //预测
            List<CityWeatherForecast> cityWeatherForecasts = cityForecast.get(cityCode);
            List<CityWeatherForecast> cityWeatherForecasts = Objects.isNull(cityForecast.get(cityCode))?new ArrayList<>():cityForecast.get(cityCode);

            //获取城市历史气象数据
            List<CityWeather> cityWeathers = cityHistoryWeather.get(cityCode);
@@ -210,7 +205,10 @@
                }
            }
        }
       // forecastMapper.insertForecast(forecastList);
        if(forecastList.size()>0){
            forecastMapper.insertForecast(forecastList);
        }

    }

    private Double calculateAvg(List<Map<String, Object>> list, String param) {