From 33d898d8146223184fcaab82a9e16649434a1ab6 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 09 Sep 2022 17:47:54 +0800
Subject: [PATCH] 千灯数据转发bug修改
---
src/main/java/com/moral/task/HistoryTableInsertTask.java | 70 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index b28fb66..bc20ac7 100644
--- a/src/main/java/com/moral/task/HistoryTableInsertTask.java
+++ b/src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -27,6 +27,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
@@ -59,34 +60,38 @@
@Resource
private WeatherUtil weatherUtil;
+ @Resource
+ RedisTemplate redisTemplate;
@XxlJob("historyMinutely")
public ReturnT insertHistoryMinutelyTable(String params) {
- 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);
- LocalDateTime startTime = endTime.minusMinutes(1);
- List<String> sensorKeys = sensorService.getSensorKeys();
+ //������������������
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:00");
+ Date insertTimeDate = new Date();
+ Date startTimeDate = DateUtil.rollMinute(insertTimeDate, -2);
+ Date endTimeDate = DateUtil.rollMinute(insertTimeDate, -1);
+ StringBuilder insertTime = new StringBuilder(sdf.format(insertTimeDate));
+ StringBuilder endTime = new StringBuilder(sdf.format(endTimeDate));
+ StringBuilder startTime = new StringBuilder(sdf.format(startTimeDate));
+ String queryYearAndMonthDay = DateUtil.getYear(startTimeDate) + DateUtil.getMonth(startTimeDate) + DateUtil.getDay(startTimeDate);
+
+ //������������
+ /*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date endTimeDate = sdf.parse("2020-11-01 00:00:20");
+ Date startTimeDate = DateUtil.rollMinute(endTimeDate, -1);
+ StringBuilder endTime = new StringBuilder(sdf.format(endTimeDate));
+ StringBuilder startTime = new StringBuilder(sdf.format(startTimeDate));
+ endTime.replace(17, 19, "00");
+ startTime.replace(17, 19, "00");
+ String queryYearAndMonthDay = DateUtil.getYear(startTimeDate) + DateUtil.getMonth(startTimeDate) + DateUtil.getDay(startTimeDate);*/
+
Map<String, Object> devices = new HashMap<>();
+ List<String> sensorKeys = sensorService.getSensorKeys();
devices.put("sensorKeys", sensorKeys);
- devices.put("start", startTime);
- devices.put("end", endTime);
+ devices.put("start", startTime.toString());
+ devices.put("end", endTime.toString());
+ devices.put("yearAndMonthDay", queryYearAndMonthDay);
+
try {
List<Map<String, Object>> minutelyData = deviceService.getSensorData(devices);
XxlJobLogger.log("historyMinutelyData:" + minutelyData.size());
@@ -94,26 +99,25 @@
for (Map<String, Object> deviceData : minutelyData) {
if (!ObjectUtils.isEmpty(deviceData)) {
Map<String, Object> minutelyDataMap = new LinkedHashMap<>();
- JSONObject jo = new JSONObject(true);
+ Map<String, Object> map = new HashMap<>();
minutelyDataMap.put("mac", deviceData.get("mac"));
- minutelyDataMap.put("time", startTime);
- JSONArray jsonArray = new JSONArray();
+ minutelyDataMap.put("time", insertTime.toString());
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);
+ map.put(key, date);
}
}
- jsonArray.add(jo);
- minutelyDataMap.put("json", jsonArray.get(0).toString());
+ minutelyDataMap.put("json", JSONObject.toJSONString(map));
minutelyDataList.add(minutelyDataMap);
}
}
if (!CollectionUtils.isEmpty(minutelyDataList)) {
- historyMinutelyService.insertHistoryMinutely(minutelyDataList, yearAndMonth);
+ String insertYearAndMonth = DateUtil.getYear(endTimeDate) + DateUtil.getMonth(endTimeDate);
+ historyMinutelyService.insertHistoryMinutely(minutelyDataList, insertYearAndMonth);
ReturnT returnT = new ReturnT(200, "���������������������");
return returnT;
}
@@ -124,6 +128,9 @@
ReturnT returnT = new ReturnT(500, e.getMessage());
return returnT;
}
+ List record = new ArrayList();
+ record.add("repairMinutelyData_"+endTimeDate.getTime()/1000);
+ redisTemplate.opsForList().leftPushAll("unrepair_data", record);
ReturnT returnT = new ReturnT(500, "���������������������");
return returnT;
}
@@ -198,6 +205,9 @@
e.printStackTrace();
}
ReturnT returnT = new ReturnT(500, "���������������������");
+ List record = new ArrayList();
+ record.add("repairHourlyData_"+endTimeDate.getTime()/1000);
+ redisTemplate.opsForList().leftPushAll("unrepair_data", record);
return returnT;
}
--
Gitblit v1.8.0