From 22f8bf0630187800c47c3907eecfedcc13abc540 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 02 Apr 2020 17:11:17 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/task/HistoryTableInsertTask.java | 75 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index ea5796f..113e307 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);
@@ -74,7 +83,7 @@
minutelyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -136,7 +145,7 @@
minutelyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -189,7 +198,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -243,7 +252,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -297,7 +306,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -351,7 +360,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -405,7 +414,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -460,7 +469,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -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);
@@ -516,11 +534,16 @@
hourlyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
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);
}
}
@@ -581,11 +604,16 @@
hourlyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
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);
}
}
@@ -640,11 +668,16 @@
hourlyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
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);
}
}
@@ -694,7 +727,7 @@
dailyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
if (deviceData.get("MIN" + key) instanceof String) {
@@ -756,7 +789,7 @@
minutelyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -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) {
@@ -821,7 +854,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
--
Gitblit v1.8.0