cjl
2023-07-24 3ce298bd6f26c0807074dc50c73abf0c3abeaf53
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -415,15 +415,13 @@
                    String son = numCount+"_"+sensorMap.get(sensorsList.get(z));
                    if(listMap.containsKey(numCount+"_"+sensorMap.get(sensorsList.get(z)))){
                        if(son.contains("臭氧")){
                            rsAvg = percentile(listMap.get(numCount+"_"+sensorMap.get(sensorsList.get(z))),95d);
                        }else if(son.contains("一氧化碳")){
                            rsAvg = percentile(listMap.get(numCount+"_"+sensorMap.get(sensorsList.get(z))),90d);
                        }else if(son.contains("一氧化碳")){
                            rsAvg = percentile(listMap.get(numCount+"_"+sensorMap.get(sensorsList.get(z))),95d);
                        }else {
                            Double ListAvg = listMap.get(numCount+"_"+sensorMap.get(sensorsList.get(z))).stream().collect(Collectors.averagingDouble(Double::doubleValue));
                            rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
                        }
                    }
                    timeValueMap.put(sensorMap.get(sensorsList.get(z)),rsAvg);
                }