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

cjl

2023-10-19 2a4a9ef52b0d76efb9712fd8d4268f658546f99f

 screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java

@@ -39,7 +39,18 @@
    @XxlJob("insertHistoryAqi")
    public ReturnT insertHistoryAqi() {
        try {
            historyAqiService.insertHistoryAqi();
            historyAqiService.insertHistoryAqi(null);
        } catch (Exception e) {
            XxlJobHelper.log(e.getMessage());
            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
        }
        return ReturnT.SUCCESS;
    }

    @XxlJob("insertHCHistoryAqi")
    public ReturnT insertHCHistoryAqi() {
        try {
            historyAqiService.insertHCHistoryAqi();
        } catch (Exception e) {
            XxlJobHelper.log(e.getMessage());
            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());