Merge remote-tracking branch 'origin/master'

jinpengyong

2020-06-03 4f3fd6c40cf8ff706f86363ccd6555164f348d63

 src/main/java/com/moral/task/AlarmTableInsertTask.java

@@ -6,14 +6,14 @@

import javax.annotation.Resource;

import com.moral.service.AlarmService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;

import com.moral.service.AlarmService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;

@Component
public class AlarmTableInsertTask {
@@ -23,7 +23,7 @@
    private AlarmService alarmService;

    @XxlJob("alarmDaily")
    public ReturnT insertAlarmDailyTable() {
    public ReturnT insertAlarmDailyTable(String param) {
        List<Map<String, Object>> list = alarmService.getAlarmData();
        if (!CollectionUtils.isEmpty(list)) {
            alarmService.insertAlarmDaily(list);
@@ -33,7 +33,7 @@
    }

    @XxlJob("createAlarmSubTable")
    public ReturnT createAlarmSubTable() {
    public ReturnT createAlarmSubTable(String param) {
        LocalDateTime time = LocalDateTime.now().plusMonths(1);
        String year = time.getYear() + "";
        String month = time.getMonthValue() + "";