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;
                }
            }