From c19edaf7f49f2ae801172886e633e6e5168db64c Mon Sep 17 00:00:00 2001
From: ZhuDongming <zdm773644075@hotmail.com>
Date: Fri, 01 May 2020 13:31:41 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/task/HistoryTableInsertTask.java | 134 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 132 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index 8225048..24c66e5 100644
--- a/src/main/java/com/moral/task/HistoryTableInsertTask.java
+++ b/src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -17,12 +17,14 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
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;
@@ -39,6 +41,9 @@
private DeviceService deviceService;
@Resource
+ private HistoryService historyService;
+
+ @Resource
private HistoryMinutelyService historyMinutelyService;
@Resource
@@ -52,6 +57,19 @@
LocalDateTime time = LocalDateTime.now();
int year = time.getYear();
int month = time.getMonthValue();
+ int day = time.getDayOfMonth();
+ int hour = time.getHour();
+ int minute = time.getMinute();
+ if (day == 1) {
+ if (hour == 0 && minute == 0) {
+ 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);
@@ -105,6 +123,18 @@
LocalDateTime time = LocalDateTime.now();
int year = time.getYear();
int month = time.getMonthValue();
+ int day = time.getDayOfMonth();
+ int hour = time.getHour();
+ if (day == 1) {
+ if (hour == 0) {
+ 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);
@@ -132,8 +162,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);
}
}
@@ -211,4 +246,99 @@
ReturnT returnT = new ReturnT(500, "������������������");
return returnT;
}
+
+ @XxlJob("historyMinutelyDelay")
+ public ReturnT insertHistoryMinutelyTableDelay(String params) {
+ Map macMap = JSON.parseObject(params);
+ List<String> macList = (List<String>) macMap.get("mac");
+ LocalDateTime time = LocalDateTime.now();
+ int year = time.getYear();
+ int month = time.getMonthValue();
+ int day = time.getDayOfMonth();
+ int hour = time.getHour();
+ int minute = time.getMinute();
+ if (day == 1) {
+ if (hour == 0 && minute <= 30) {
+ if (month == 1) {
+ month = 12;
+ year = year - 1;
+ } else {
+ month = month - 1;
+ }
+ }
+ }
+ String monthStr = month < 10 ? ("0" + month) : month + "";
+ String yearAndMonth = year + monthStr;
+ LocalDateTime value = time.truncatedTo(ChronoUnit.MINUTES);
+ LocalDateTime startTime = value.minusMinutes(31);
+ LocalDateTime endTime = value.minusMinutes(30);
+ List<String> sensorKeys = sensorService.getSensorKeys();
+ Map<String, Object> devices = new HashMap<>();
+ devices.put("sensorKeys", sensorKeys);
+ devices.put("macList", macList);
+ devices.put("start", startTime);
+ devices.put("end", endTime);
+ try {
+ List<Map<String, Object>> minutelyData = deviceService.getSensorDataByMac(devices);
+ XxlJobLogger.log("historyMinutelyData:" + minutelyData.size());
+ List<Map<String, Object>> minutelyDataList = new ArrayList<>();
+ for (Map<String, Object> deviceData : minutelyData) {
+ if (!ObjectUtils.isEmpty(deviceData)) {
+ Map<String, Object> minutelyDataMap = new LinkedHashMap<>();
+ JSONObject jo = new JSONObject(true);
+ minutelyDataMap.put("mac", deviceData.get("mac"));
+ minutelyDataMap.put("time", startTime);
+ JSONArray jsonArray = new JSONArray();
+ for (String key : deviceData.keySet()) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
+ List<Object> date = new ArrayList<>();
+ date.add(deviceData.get(key));
+ date.add(deviceData.get("MIN" + key));
+ date.add(deviceData.get("MAX" + key));
+ jo.put(key, date);
+ }
+ }
+ jsonArray.add(jo);
+ minutelyDataMap.put("json", jsonArray.get(0).toString());
+ minutelyDataList.add(minutelyDataMap);
+ }
+ }
+ if (!CollectionUtils.isEmpty(minutelyDataList)) {
+ historyMinutelyService.insertHistoryMinutely(minutelyDataList, yearAndMonth);
+ ReturnT returnT = new ReturnT(200, "���������������������");
+ return returnT;
+ }
+ } catch (Exception e) {
+ XxlJobLogger.log("historyMinutelyException:" + e.getMessage());
+ logger.error(e.getMessage());
+ e.printStackTrace();
+ }
+ ReturnT returnT = new ReturnT(500, "���������������������");
+ 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();
+ Map<String, Object> devices = new HashMap<>();
+ devices.put("macList", macList);
+ devices.put("time", value);
+ try {
+ int count = historyService.insertHistorySpecialTable(devices);
+ XxlJobLogger.log("insertHistorySpecialTable:" + count);
+ if (count > 0) {
+ 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