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

cjl

2023-07-27 44251a92dc85a93eff59704b40b07830bde8d16f

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

@@ -1,9 +1,11 @@
package com.moral.api.task;

import com.moral.api.service.AlarmInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import com.moral.api.service.HistoryFiveMinutelyService;
import com.moral.api.service.HistoryHourlyService;
import com.moral.api.service.HistoryMinutelyService;
import com.moral.constant.Constants;
import com.moral.util.DateUtils;
@@ -19,6 +21,12 @@

    @Autowired
    private HistoryMinutelyService historyMinutelyService;

    @Autowired
    private HistoryHourlyService historyHourlyService;

    @Autowired
    private AlarmInfoService alarmInfoService;


    //分钟表创建任务
@@ -49,4 +57,46 @@
        }
        return ReturnT.SUCCESS;
    }

    //小时表创建任务
    @XxlJob("createHistoryHourlyTable")
    public ReturnT createHistoryHourlyTable() {
        String timeUnits = DateUtils.getDateStringOfMon(1, DateUtils.yyyyMM_EN);
        try {
            //已校准小时表
            historyHourlyService.createTable(timeUnits);
            //未校准小时表
            historyHourlyService.createTable(timeUnits + "_" + Constants.UN_ADJUST);
        } catch (Exception e) {
            XxlJobHelper.log(e.getMessage());
            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
        }
        return ReturnT.SUCCESS;
    }

    //包含最大值，最小值，平均值的小时表创建任务
    @XxlJob("createHistoryHourlyCompleteTable")
    public ReturnT createHistoryHourlyCompleteTable(){
        String timeUnits = DateUtils.getDateStringOfMon(1, DateUtils.yyyyMM_EN);
        try {
            historyHourlyService.createTableComplete(timeUnits);
        } catch (Exception e) {
            XxlJobHelper.log(e.getMessage());
            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
        }
        return ReturnT.SUCCESS;
    }

    //小时表创建任务
    @XxlJob("createAlarmInfoTable")
    public ReturnT createAlarmInfoTable() {
        String timeUnits = DateUtils.getDateStringOfMon(1, DateUtils.yyyyMM_EN);
        try {
            alarmInfoService.createTable(timeUnits);
        } catch (Exception e) {
            XxlJobHelper.log(e.getMessage());
            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
        }
        return ReturnT.SUCCESS;
    }
}