均值计算上下限修改

jinpengyong

2021-09-28 38c84ea8b272bedd429e0031f283cdc83e203c76

 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;
@@ -183,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;
                }
            }
@@ -280,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;
                }
            }
@@ -318,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;
                }
            }