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

jinpengyong

2023-08-22 6eb8f65d4a69a550945a92cc916d3c63dee739fa

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

@@ -30,6 +30,11 @@
    @Autowired
    private CityAqiYearlyService cityAqiYearlyService;

    @XxlJob("insertHistoryAqisss")
    public ReturnT insertHistoryAqisss() {
       System.out.println("已执行job");
        return ReturnT.SUCCESS;
    }
    //国控站aqi小时数据接入
    @XxlJob("insertHistoryAqi")
    public ReturnT insertHistoryAqi() {
@@ -42,6 +47,17 @@
        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());
        }
        return ReturnT.SUCCESS;
    }

    //城市aqi小时数据接入
    @XxlJob("insertCityAqi")
    public ReturnT insertCityAqi() {