From 38c84ea8b272bedd429e0031f283cdc83e203c76 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 28 Sep 2021 16:02:08 +0800
Subject: [PATCH] 均值计算上下限修改

---
 screen-common/src/main/java/com/moral/util/AmendUtils.java |   67 ++++++++++++++++++++++++++++-----
 1 files changed, 57 insertions(+), 10 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 4a9104a..4ed255f 100644
--- a/screen-common/src/main/java/com/moral/util/AmendUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AmendUtils.java
@@ -68,12 +68,12 @@
 
                 //������������������������������
                 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;
                     }
                 }
@@ -93,12 +93,59 @@
             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;
             }
         }
         result.put(Constants.SENSOR_CODE_O3, sciCal(max, 4));
+        return result;
+    }
+
+    /**
+     * @param data ������ time:Date������
+     * @return ���������������8���������������������
+     */
+    public static List<Map<String, Object>> getO3_8H(List<Map<String, Object>> data) {
+        Date time1 = null;
+        Date time2 = null;
+        for (Map<String, Object> datum : data) {
+            Date time = (Date) datum.get("time");
+            if (DateUtils.getHour(time) == 0) {
+                time2 = DateUtils.getDate(DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_EN));
+            } else {
+                time1 = DateUtils.getDate(DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_EN));
+            }
+        }
+
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (int i = 8; i <= 24; i++) {
+            Map<String, Object> map = new HashMap<>();
+            if (i < 24) {
+                map.put("time", ObjectUtils.isEmpty(time1) ? null : DateUtils.addHours(time1, i));
+            } else {
+                map.put("time", ObjectUtils.isEmpty(time2) ? null : time2);
+            }
+            List<Double> value = new ArrayList<>();
+            for (Map<String, Object> dataMap : data) {
+                Double o3 = Double.parseDouble(dataMap.get(Constants.SENSOR_CODE_O3).toString());
+                Date time = (Date) dataMap.get("time");
+                int hour = DateUtils.getHour(time);
+                if (hour == 0) {
+                    hour = 24;
+                }
+                if (hour <= i && hour >= i - 7) {
+                    value.add(o3);
+                }
+            }
+            if (value.size() < 6) {
+                continue;
+            }
+            double average = value.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage();
+            map.put(Constants.SENSOR_CODE_O3, average);
+            result.add(map);
+        }
         return result;
     }
 
@@ -137,25 +184,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;
                 }
             }
@@ -234,12 +281,12 @@
             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;
                 }
             }
@@ -272,12 +319,12 @@
             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