From c534d4ac66958e9f2e9be2d9d7587c55fb3bb42f Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 17 Apr 2020 11:12:27 +0800
Subject: [PATCH] add 走航车等设备的history表数据重新存一份
---
src/main/java/com/moral/task/HistoryTableInsertTask.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index 113e307..009c19b 100644
--- a/src/main/java/com/moral/task/HistoryTableInsertTask.java
+++ b/src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -20,10 +20,12 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.moral.entity.History;
import com.moral.service.DeviceService;
import com.moral.service.HistoryDailyService;
import com.moral.service.HistoryHourlyService;
import com.moral.service.HistoryMinutelyService;
+import com.moral.service.HistoryService;
import com.moral.service.SensorService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
@@ -38,6 +40,9 @@
@Resource
private DeviceService deviceService;
+
+ @Resource
+ private HistoryService historyService;
@Resource
private HistoryMinutelyService historyMinutelyService;
@@ -83,7 +88,7 @@
minutelyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -145,7 +150,7 @@
minutelyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -198,7 +203,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -252,7 +257,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -306,7 +311,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -360,7 +365,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -414,7 +419,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -469,7 +474,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -534,7 +539,7 @@
hourlyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
if (deviceData.get("MIN" + key) instanceof String) {
@@ -604,7 +609,7 @@
hourlyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
if (deviceData.get("MIN" + key) instanceof String) {
@@ -668,7 +673,7 @@
hourlyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
if (deviceData.get("MIN" + key) instanceof String) {
@@ -727,7 +732,7 @@
dailyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
if (deviceData.get("MIN" + key) instanceof String) {
@@ -789,7 +794,7 @@
minutelyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -854,7 +859,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -881,4 +886,31 @@
return returnT;
}
+ @XxlJob("historySpecial")
+ public ReturnT insertHistorySpecialTable(String params) {
+ Map macMap = JSON.parseObject(params);
+ List<String> macList = (List<String>) macMap.get("mac");
+ LocalDateTime value = LocalDateTime.now();
+ LocalDateTime time = value.truncatedTo(ChronoUnit.SECONDS);
+ LocalDateTime tenSecondsAgo = time.minusSeconds(10);
+ Map<String, Object> devices = new HashMap<>();
+ devices.put("macList", macList);
+ devices.put("time", tenSecondsAgo);
+ try {
+ List<History> historyData = historyService.selectByMacAndTime(devices);
+ if (!CollectionUtils.isEmpty(historyData)) {
+ int count = historyService.insertHistorySpecialTable(devices);
+ XxlJobLogger.log("insertHistorySpecialTable:" + count);
+ ReturnT returnT = new ReturnT(200, "������historySpecial���������");
+ return returnT;
+ }
+ } catch (Exception e) {
+ XxlJobLogger.log("insertHistorySpecialTableException:" + e.getMessage());
+ logger.error(e.getMessage());
+ e.printStackTrace();
+ }
+ ReturnT returnT = new ReturnT(500, "������historySpecial���������");
+ return returnT;
+ }
+
}
--
Gitblit v1.8.0