From 076ae2ec06b5d0e6f61e0f70ef61b8af120537ab Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 02 Apr 2020 16:04:31 +0800
Subject: [PATCH] update实时跑任务判断1号取那张表
---
src/main/java/com/moral/task/HistoryTableInsertTask.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index ea5796f..c2437db 100644
--- a/src/main/java/com/moral/task/HistoryTableInsertTask.java
+++ b/src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -53,6 +53,15 @@
LocalDateTime time = LocalDateTime.now();
int year = time.getYear();
int month = time.getMonthValue();
+ int day = time.getDayOfMonth();
+ if (day == 1) {
+ if (month == 1) {
+ month = 12;
+ year = year - 1;
+ } else {
+ month = month - 1;
+ }
+ }
String monthStr = month < 10 ? ("0" + month) : month + "";
String yearAndMonth = year + monthStr;
LocalDateTime endTime = time.truncatedTo(ChronoUnit.MINUTES);
@@ -492,6 +501,15 @@
LocalDateTime time = LocalDateTime.now();
int year = time.getYear();
int month = time.getMonthValue();
+ int day = time.getDayOfMonth();
+ if (day == 1) {
+ if (month == 1) {
+ month = 12;
+ year = year - 1;
+ } else {
+ month = month - 1;
+ }
+ }
String monthStr = month < 10 ? ("0" + month) : month + "";
String yearAndMonth = year + monthStr;
LocalDateTime endTime = time.truncatedTo(ChronoUnit.HOURS);
@@ -519,8 +537,13 @@
if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
- date.add(new BigDecimal(deviceData.get("MIN" + key).toString()));
- date.add(new BigDecimal(deviceData.get("MAX" + key).toString()));
+ if (deviceData.get("MIN" + key) instanceof String) {
+ date.add(new BigDecimal(deviceData.get("MIN" + key).toString()));
+ date.add(new BigDecimal(deviceData.get("MAX" + key).toString()));
+ } else if (deviceData.get("MIN" + key) instanceof byte[]) {
+ date.add(new BigDecimal(new String((byte[]) (deviceData.get("MIN" + key)))));
+ date.add(new BigDecimal(new String((byte[]) (deviceData.get("MAX" + key)))));
+ }
jo.put(key, date);
}
}
@@ -584,8 +607,13 @@
if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
- date.add(new BigDecimal(deviceData.get("MIN" + key).toString()));
- date.add(new BigDecimal(deviceData.get("MAX" + key).toString()));
+ if (deviceData.get("MIN" + key) instanceof String) {
+ date.add(new BigDecimal(deviceData.get("MIN" + key).toString()));
+ date.add(new BigDecimal(deviceData.get("MAX" + key).toString()));
+ } else if (deviceData.get("MIN" + key) instanceof byte[]) {
+ date.add(new BigDecimal(new String((byte[]) (deviceData.get("MIN" + key)))));
+ date.add(new BigDecimal(new String((byte[]) (deviceData.get("MAX" + key)))));
+ }
jo.put(key, date);
}
}
@@ -643,8 +671,13 @@
if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
- date.add(new BigDecimal(deviceData.get("MIN" + key).toString()));
- date.add(new BigDecimal(deviceData.get("MAX" + key).toString()));
+ if (deviceData.get("MIN" + key) instanceof String) {
+ date.add(new BigDecimal(deviceData.get("MIN" + key).toString()));
+ date.add(new BigDecimal(deviceData.get("MAX" + key).toString()));
+ } else if (deviceData.get("MIN" + key) instanceof byte[]) {
+ date.add(new BigDecimal(new String((byte[]) (deviceData.get("MIN" + key)))));
+ date.add(new BigDecimal(new String((byte[]) (deviceData.get("MAX" + key)))));
+ }
jo.put(key, date);
}
}
@@ -810,7 +843,7 @@
devices.put("start", startTime);
devices.put("end", endTime);
try {
- List<Map<String, Object>> minutelyData = deviceService.getSensorDataByMac(devices);
+ List<Map<String, Object>> minutelyData = deviceService.getSensorDataByMacOnce(devices);
XxlJobLogger.log("historyMinutelyData:" + minutelyData.size());
List<Map<String, Object>> minutelyDataList = new ArrayList<>();
for (Map<String, Object> deviceData : minutelyData) {
--
Gitblit v1.8.0