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

jinpengyong

2023-10-13 bb6856a82a588f05040b0410a9747ae8029bb3be

 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;

@@ -54,7 +57,12 @@
    @GetMapping("insertHistoryFiveMinutely")
    @ApiOperation(value = "5分钟数据", notes = "5分钟数据")
    public ResultMessage insertHistoryFiveMinutely() {
        String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
        historyFiveMinutelyService.insertHistoryFiveMinutely();
        String s ="2023-10-13 03:35";
        String s1 ="2023-10-13 03:40";
        Date start = DateUtils.getDate(s,format);
        Date end = DateUtils.getDate(s1,format);
        return new ResultMessage();
    }

@@ -67,11 +75,17 @@

    @GetMapping("insertHistoryAqi")
    @ApiOperation(value = "过控制战补偿", notes = "过控制战补偿")
    public ResultMessage insertHistoryAqi() {
        historyAqiService.insertHistoryAqi();
    public ResultMessage insertHistoryAqi(String time) {
        historyAqiService.insertHistoryAqi(time);
        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 +99,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) {