Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-11-01 856f1cf8ee52443ce616ce00ecff7cbb7c30f000

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

@@ -44,6 +44,8 @@
    private HistoryAqiService historyAqiService;
    @Autowired
    private HistoryHourlyService historyHourlyService;
    @Autowired
    private HistoryMonthlyService historyMonthlyService;

    @GetMapping("insertHistoryDaily")
    @ApiOperation(value = "天数据补录", notes = "天数据补录")
@@ -57,7 +59,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();
    }

@@ -70,8 +77,8 @@

    @GetMapping("insertHistoryAqi")
    @ApiOperation(value = "过控制战补偿", notes = "过控制战补偿")
    public ResultMessage insertHistoryAqi() {
        historyAqiService.insertHistoryAqi();
    public ResultMessage insertHistoryAqi(String time) {
        historyAqiService.insertHistoryAqi(time);
        return new ResultMessage();
    }

@@ -101,6 +108,13 @@
        return new ResultMessage();
    }

    @GetMapping("insertHistoryMonthly")
    @ApiOperation(value = "月数据", notes = "月数据")
    public ResultMessage insertHistoryMonthly() {
        historyMonthlyService.insertHistoryMonthly();
        return new ResultMessage();
    }


    public static void main(String[] args) {
        String host = "https://pair.market.alicloudapi.com";