From 6050927edf6c00f2f06b0b0775502d38eb5b7705 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 25 Nov 2021 13:37:37 +0800
Subject: [PATCH] 陆家设备因子浓度报警邮件
---
src/main/java/com/moral/task/HistoryFiveMinutelyTask.java | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryFiveMinutelyTask.java b/src/main/java/com/moral/task/HistoryFiveMinutelyTask.java
index 9f2196c..9491ff3 100644
--- a/src/main/java/com/moral/task/HistoryFiveMinutelyTask.java
+++ b/src/main/java/com/moral/task/HistoryFiveMinutelyTask.java
@@ -6,6 +6,8 @@
import com.moral.util.DateUtil;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
+import com.xxl.job.core.log.XxlJobLogger;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
@@ -20,6 +22,9 @@
@Resource
SensorService sensorService;
+
+ @Resource
+ RedisTemplate redisTemplate;
@XxlJob("createHistoryFiveMinutelyTb")
public ReturnT createHistoryMinutelyTb(String param) {
@@ -43,20 +48,18 @@
* 10:20:30 ������10:15--10:20���������*/
@XxlJob("insertHistoryFiveMinutelyTb")
public ReturnT insertHistoryFiveMinutely(String param) {
- /*������������������������������������������������������������������*/
- Map<String, Object> params = getStartAndEndTime();
- List<String> sensorKeys = sensorService.getSensorKeys();
- params.put("sensorKeys", sensorKeys);
- List<Map<String, Object>> fiveMinutesSensorDatas;
+ //������������������
+ Date errorDate = new Date();
try {
+ /*������������������������������������������������������������������*/
+ Map<String, Object> params = getStartAndEndTime();
+ List<String> sensorKeys = sensorService.getSensorKeys();
+ params.put("sensorKeys", sensorKeys);
+ List<Map<String, Object>> fiveMinutesSensorDatas;
fiveMinutesSensorDatas = historyFiveMinutelyService.getFiveMinutesSensorData(params);
- } catch (Exception e) {
- return new ReturnT(500, "���������������������������");
- }
- /*������������������������������*/
- List<Map<String, Object>> insertDatas;
- try {
+ /*������������������������������*/
+ List<Map<String, Object>> insertDatas;
insertDatas = new ArrayList<>();
for (Map<String, Object> data : fiveMinutesSensorDatas) {
String mac = (String) data.get("mac");
@@ -80,17 +83,24 @@
});
String keyAndValueJson = JSON.toJSONString(keyAndValueMap);
insertDataMap.put("mac", mac);
- insertDataMap.put("time", params.get("start"));
+ insertDataMap.put("time", params.get("end"));
insertDataMap.put("json", keyAndValueJson);
insertDatas.add(insertDataMap);
}
+ /*������������������������*/
+ if (!ObjectUtils.isEmpty(insertDatas)) {
+ historyFiveMinutelyService.insertHistoryFiveMinutely(insertDatas, (String) params.get("yearAndMonth"));
+ return new ReturnT(200, "���������������������������");
+ }
} catch (Exception e) {
- return new ReturnT(500, "������������������");
+ XxlJobLogger.log("historyFiveMinutelyException:" + e.getMessage());
+ e.printStackTrace();
}
- /*������������������������*/
- historyFiveMinutelyService.insertHistoryFiveMinutely(insertDatas, (String) params.get("yearAndMonth"));
- return new ReturnT(200, "������������������");
+ List record = new ArrayList();
+ record.add("repairFiveMinutelyData_" + errorDate.getTime() / 1000);
+ redisTemplate.opsForList().leftPushAll("unrepair_data", record);
+ return new ReturnT(500, "���������������������������");
}
/**
@@ -114,12 +124,14 @@
if (endMinute >= 5) {
StringBuilder time = new StringBuilder(sdf.format(date));
startTime = time.replace(15, 19, "0:00").toString();
- endTime = time.replace(15, 19, "4:00").toString();
+ endTime = time.replace(15, 19, "5:00").toString();
} else {
+ StringBuilder endTimesb = new StringBuilder(sdf.format(date));
+ endTime = endTimesb.replace(15, 19, "0:00").toString();
date = DateUtil.rollMinute(date, -5);
- StringBuilder time = new StringBuilder(sdf.format(date));
- startTime = time.replace(15, 19, "5:00").toString();
- endTime = time.replace(15, 19, "9:00").toString();
+ StringBuilder startTimesb = new StringBuilder(sdf.format(date));
+ startTime = startTimesb.replace(15, 19, "5:00").toString();
+
}
year = DateUtil.getYear(date);
--
Gitblit v1.8.0