From 35fa7f327c9a8fc2fa3072af4f734ce793d93582 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 24 Nov 2020 09:53:13 +0800
Subject: [PATCH] 修改平均风向SQL语句。

---
 src/main/java/com/moral/task/HistoryFiveMinutelyTask.java |   40 +++++++++++++++++++++++++---------------
 src/main/java/com/moral/task/HistoryTableInsertTask.java  |    9 +++++++++
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/moral/task/HistoryFiveMinutelyTask.java b/src/main/java/com/moral/task/HistoryFiveMinutelyTask.java
index 2c1f33e..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");
@@ -84,13 +87,20 @@
                 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, "���������������������������");
     }
 
     /**
diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index 075b348..201af98 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,6 +60,8 @@
     @Resource
     private WeatherUtil weatherUtil;
 
+    @Resource
+    RedisTemplate redisTemplate;
 
     @XxlJob("historyMinutely")
     public ReturnT insertHistoryMinutelyTable(String params) {
@@ -125,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;
     }
@@ -199,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