From b129ec5b6d0268dce3233e715e5c31923731daf2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 04 Nov 2020 15:16:24 +0800
Subject: [PATCH] 分钟表数据插入时,异常抛出

---
 src/main/java/com/moral/task/HistoryTableInsertTask.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index 0e6bfa2..3b4d770 100644
--- a/src/main/java/com/moral/task/HistoryTableInsertTask.java
+++ b/src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -120,6 +120,8 @@
             XxlJobLogger.log("historyMinutelyException:" + e.getMessage());
             logger.error(e.getMessage());
             e.printStackTrace();
+            ReturnT returnT = new ReturnT(500, e.getMessage());
+            return returnT;
         }
         ReturnT returnT = new ReturnT(500, "���������������������");
         return returnT;
@@ -337,8 +339,8 @@
         String s1=format.format(date1);
         Map<String, Object> devices = new HashMap<>();
         devices.put("macList", macList);
-        devices.put("startTime", s);
-        devices.put("endTime", s1);
+        devices.put("startTime", s1);
+        devices.put("endTime", s);
         try {
             int count = historyService.insertHistorySpecialTable(devices);
             XxlJobLogger.log("insertHistorySpecialTable:" + count);

--
Gitblit v1.8.0