From 4f3fd6c40cf8ff706f86363ccd6555164f348d63 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 03 Jun 2020 10:37:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/task/AlarmTableInsertTask.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/task/AlarmTableInsertTask.java b/src/main/java/com/moral/task/AlarmTableInsertTask.java
index 189c344..be063b8 100644
--- a/src/main/java/com/moral/task/AlarmTableInsertTask.java
+++ b/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() + "";
--
Gitblit v1.8.0