update

jinpengyong

2021-09-28 969ce7a3fba8b548c1fef7fbc53975b5bb4d33de

 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;
@@ -103,6 +104,52 @@
    }

    /**
     * @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;
    }

    /**
     * @param params 参数
     * @return 功能：风向均值计算
     */