jinpengyong
2021-11-12 5fab4a685ce81fd2efa3546dc0716d223f9db09b
screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
@@ -85,11 +85,6 @@
            dataMap.put("mac", mac);
            dataMap.put("time", start);
            //中间变量,用于计算除臭氧外其它因子
            List<Map<String, Object>> tempValue = new ArrayList<>(value);
            //移除第一天数据(0点的),O3滑动值第一条数据是从1点-8点
            value.removeIf(map -> ((Date) map.get("time")).getTime() == start.getTime());
            Map<String, Object> params = new HashMap<>();
            params.put("data", value);
            params.put("type", "day");
@@ -131,12 +126,8 @@
            if (!ObjectUtils.isEmpty(o3AvgOfDay)) {
                jsonMap.putAll(o3AvgOfDay);
            }
            //除臭氧外其他因子均值计算
            tempValue.removeIf(o -> ((Date) o.get("time")).getTime() == end.getTime());
            //风向均值计算并修约
            params.put("data", tempValue);
            Map<String, Object> windDirAvg = AmendUtils.getWindDirAvg(params);
            if (!ObjectUtils.isEmpty(windDirAvg)) {
                jsonMap.putAll(windDirAvg);
@@ -146,7 +137,7 @@
                String sensorCode = sensor.getCode();
                Double upper = sensor.getUpper();
                Double lower = sensor.getLower();
                OptionalDouble optionalDouble = tempValue.parallelStream()
                OptionalDouble optionalDouble = value.parallelStream()
                        .flatMapToDouble(v -> {
                            Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
                            Object sensorValue = dataValue.get(sensorCode);