From 3421ec9112c3742c76b2f733434c3ee499f5be8a Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 19 Jun 2020 16:25:45 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job
---
src/main/java/com/moral/task/AlarmTableInsertTask.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moral/task/AlarmTableInsertTask.java b/src/main/java/com/moral/task/AlarmTableInsertTask.java
index 189c344..b33f4c0 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,17 +23,14 @@
private AlarmService alarmService;
@XxlJob("alarmDaily")
- public ReturnT insertAlarmDailyTable() {
- List<Map<String, Object>> list = alarmService.getAlarmData();
- if (!CollectionUtils.isEmpty(list)) {
- alarmService.insertAlarmDaily(list);
+ public ReturnT insertAlarmDailyTable(String param) {
+ alarmService.insertAlarmDaily();
return new ReturnT(200, "������������������");
- }
- return new ReturnT(500, "������������������");
+
}
@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