From db56a260709d59c872b15d8eb6734fcb99f6cf2b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 28 Oct 2021 10:46:02 +0800
Subject: [PATCH] 城市aqi日数据统计定时任务

---
 screen-common/src/main/java/com/moral/util/AmendUtils.java |   55 +++++++++++++++++++++++++++++++++----------------------
 1 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/screen-common/src/main/java/com/moral/util/AmendUtils.java b/screen-common/src/main/java/com/moral/util/AmendUtils.java
index 1f08009..4218796 100644
--- a/screen-common/src/main/java/com/moral/util/AmendUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AmendUtils.java
@@ -93,7 +93,6 @@
             avgs.add(average);
         }
         max = avgs.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getMax();
-        System.out.println(avgs.size());
         if (avgs.size() < 14) {
             if (max < 160d) {
                 return result;
@@ -103,8 +102,24 @@
         return result;
     }
 
+    //������aqi���������
+    public static Double o3OfDay(List<Map<String, Object>> value) {
+        List<Map<String, Object>> o3_8H = getO3_8H(value);
+        if (!ObjectUtils.isEmpty(o3_8H)) {
+            double o3 = 0d;
+            for (Map<String, Object> o : o3_8H) {
+                double temp = (double) o.get("o3");
+                if (temp > o3) {
+                    o3 = temp;
+                }
+            }
+            return sciCal(o3, 0);
+        }
+        return null;
+    }
+
     /**
-     * @param data ������ time:Date������
+     * @param data ������ time:Date������,������key:o3
      * @return ���������������8���������������������
      */
     public static List<Map<String, Object>> getO3_8H(List<Map<String, Object>> data) {
@@ -129,7 +144,8 @@
             }
             List<Double> value = new ArrayList<>();
             for (Map<String, Object> dataMap : data) {
-                Double o3 = Double.parseDouble(dataMap.get(Constants.SENSOR_CODE_O3).toString());
+                Map<String, Object> sensorValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
+                Double o3 = Double.parseDouble(sensorValue.get("o3").toString());
                 Date time = (Date) dataMap.get("time");
                 int hour = DateUtils.getHour(time);
                 if (hour == 0) {
@@ -143,7 +159,7 @@
                 continue;
             }
             double average = value.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage();
-            map.put(Constants.SENSOR_CODE_O3, average);
+            map.put("o3", average);
             result.add(map);
         }
         return result;
@@ -172,8 +188,11 @@
             Object speed = dataValue.get(Constants.SENSOR_CODE_WIND_SPEED);
             Object flagDir = dataValue.get(Constants.SENSOR_CODE_WIND_DIR + "-" + Constants.MARKER_BIT_KEY);
             Object flagSpeed = dataValue.get(Constants.SENSOR_CODE_WIND_SPEED + "-" + Constants.MARKER_BIT_KEY);
-            if (!Constants.MARKER_BIT_TRUE.equals(flagDir) || !Constants.MARKER_BIT_TRUE.equals(flagSpeed)) {
-                continue;
+
+            if (!ObjectUtils.isEmpty(flagDir) && !ObjectUtils.isEmpty(flagSpeed)) {
+                if (!Constants.MARKER_BIT_TRUE.equals(flagDir) || !Constants.MARKER_BIT_TRUE.equals(flagSpeed)) {
+                    continue;
+                }
             }
 
             if (ObjectUtils.isEmpty(wind) || ObjectUtils.isEmpty(speed)) {
@@ -184,25 +203,25 @@
 
             //���������������������������������������������������
             if (!ObjectUtils.isEmpty(windDirUpper)) {
-                if (windDir < (Double) windDirUpper) {
+                if (windDir > (Double) windDirUpper) {
                     continue;
                 }
             }
 
             if (!ObjectUtils.isEmpty(windDirLower)) {
-                if (windDir > (Double) windDirLower) {
+                if (windDir < (Double) windDirLower) {
                     continue;
                 }
             }
 
             if (!ObjectUtils.isEmpty(windSpeedUpper)) {
-                if (windSpeed < (Double) windSpeedUpper) {
+                if (windSpeed > (Double) windSpeedUpper) {
                     continue;
                 }
             }
 
             if (!ObjectUtils.isEmpty(windSpeedLower)) {
-                if (windSpeed > (Double) windSpeedLower) {
+                if (windSpeed < (Double) windSpeedLower) {
                     continue;
                 }
             }
@@ -271,22 +290,18 @@
         for (Map<String, Object> dataMap : list) {
             Map<String, Object> dataValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
             Object o = dataValue.get(Constants.SENSOR_CODE_CO);
-            Object flag = dataValue.get(Constants.SENSOR_CODE_CO + "-" + Constants.MARKER_BIT_KEY);
-            if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
-                continue;
-            }
             if (ObjectUtils.isEmpty(o)) {
                 continue;
             }
             Double co = Double.parseDouble(o.toString());
             //������������������������������
             if (!ObjectUtils.isEmpty(upper)) {
-                if (co < (Double) upper) {
+                if (co > (Double) upper) {
                     continue;
                 }
             }
             if (!ObjectUtils.isEmpty(lower)) {
-                if (co > (Double) upper) {
+                if (co < (Double) lower) {
                     continue;
                 }
             }
@@ -309,22 +324,18 @@
         for (Map<String, Object> dataMap : list) {
             Map<String, Object> dataValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
             Object o = dataValue.get(Constants.SENSOR_CODE_O3);
-            Object flag = dataValue.get(Constants.SENSOR_CODE_O3 + "-" + Constants.MARKER_BIT_KEY);
-            if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
-                continue;
-            }
             if (ObjectUtils.isEmpty(o)) {
                 continue;
             }
             Double o3 = Double.parseDouble(o.toString());
             //������������������������������
             if (!ObjectUtils.isEmpty(upper)) {
-                if (o3 < (Double) upper) {
+                if (o3 > (Double) upper) {
                     continue;
                 }
             }
             if (!ObjectUtils.isEmpty(lower)) {
-                if (o3 > (Double) upper) {
+                if (o3 < (Double) lower) {
                     continue;
                 }
             }

--
Gitblit v1.8.0