From 30d475ca8f7f09ab6ad4802add508dd51d9e20a2 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Sat, 09 Oct 2021 11:32:27 +0800
Subject: [PATCH] 修改臭氧八小时滑动平均值在臭氧无值情况下为0的问题

---
 screen-common/src/main/java/com/moral/util/AmendUtils.java |   36 ++++++++++++++++--------------------
 1 files changed, 16 insertions(+), 20 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 a22b4a1..ff1ede5 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,6 +93,7 @@
             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;
@@ -171,8 +172,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)) {
@@ -183,25 +187,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;
                 }
             }
@@ -270,22 +274,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;
                 }
             }
@@ -308,22 +308,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