Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-08-21 c386b102a2397d569131e3a459465ba84e2376be

 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;

@@ -72,6 +75,12 @@
        return new ResultMessage();
    }

    @GetMapping("insertHCHistoryAqi")
    @ApiOperation(value = "海城省控", notes = "海城省控")
    public ResultMessage insertHCHistoryAqi() {
        historyAqiService.insertHCHistoryAqi();
        return new ResultMessage();
    }
    @GetMapping("dateToChangShu")
    @ApiOperation(value = "常熟小时数据", notes = "常熟小时数据")
    public ResultMessage dateToChangShu() {
@@ -85,6 +94,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) {