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 |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/moral/task/AlarmTableInsertTask.java b/src/main/java/com/moral/task/AlarmTableInsertTask.java
index be063b8..b33f4c0 100644
--- a/src/main/java/com/moral/task/AlarmTableInsertTask.java
+++ b/src/main/java/com/moral/task/AlarmTableInsertTask.java
@@ -24,12 +24,9 @@
 
     @XxlJob("alarmDaily")
     public ReturnT insertAlarmDailyTable(String param) {
-        List<Map<String, Object>> list = alarmService.getAlarmData();
-        if (!CollectionUtils.isEmpty(list)) {
-            alarmService.insertAlarmDaily(list);
+            alarmService.insertAlarmDaily();
             return new ReturnT(200, "������������������");
-        }
-        return new ReturnT(500, "������������������");
+
     }
 
     @XxlJob("createAlarmSubTable")

--
Gitblit v1.8.0