From ea5c9d2cd28be2bbf050872cd9746368456bad42 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 05 Nov 2020 14:32:10 +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