判断时间，修改臭氧8小时滑动平均值

lizijie

2021-10-08 4b4c4114db773d2a5c3d2bcd9c15f43f7b4ff062

判断时间，修改臭氧8小时滑动平均值

 screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java

@@ -199,12 +199,30 @@
                            }
                        }
                    }
                    Double PM2_5Avg = (double)Math.round(PM2_5List.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
                    Double PM10Avg = (double)Math.round(PM10List.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
                    Double SO2Avg = (double)Math.round(SO2List.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
                    Double NO2Avg = (double)Math.round(NO2List.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
                    Double COAvg = new BigDecimal(COList.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage()).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
                    Double O3_1hAvg = (double)Math.round(O3_1hList.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
                    Double PM2_5Avg = null;
                    Double PM10Avg = null;
                    Double SO2Avg = null;
                    Double NO2Avg = null;
                    Double COAvg = null;
                    Double O3_1hAvg = null;
                    if (PM2_5List.size()>0){
                        PM2_5Avg = (double)Math.round(PM2_5List.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
                    }
                    if (PM10List.size()>0){
                        PM10Avg = (double)Math.round(PM10List.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
                    }
                    if (SO2List.size()>0){
                        SO2Avg = (double)Math.round(SO2List.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
                    }
                    if (NO2List.size()>0){
                        NO2Avg = (double)Math.round(NO2List.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
                    }
                    if (COList.size()>0){
                        COAvg = new BigDecimal(COList.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage()).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
                    }
                    if (O3_1hList.size()>0){
                        O3_1hAvg = (double)Math.round(O3_1hList.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
                    }
                    if (!ObjectUtils.isEmpty(PM2_5Avg)){
                        PM2_5List_daliy.add(PM2_5Avg);
                        oneGovMonitorPointOneHourData.put("a34004_"+govMonitorPointId,PM2_5Avg);
@@ -243,6 +261,18 @@
                        oneGovMonitorPointOneHourData.put("a05024_"+govMonitorPointId,null);
                    }
                    Double O3_8h = null;
                    //当前时间
                    Date now = new Date();
                    SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
                    //获取今天的日期
                    String nowDay = sf.format(now);
                    //对比的时间
                    //String day = sf.format(date);
                    int curHour24 = 25;
                    if (date.equals(nowDay)){
                        Calendar calendar = Calendar.getInstance();
                        curHour24 = calendar.get(calendar.HOUR_OF_DAY);
                    }
                    if (i>=7){
                        List<Double> O3_8hList = new ArrayList<>();
                        for (Integer key:O3_1hMap.keySet()){
@@ -251,7 +281,9 @@
                                O3_8hList_daliy.add(O3_1hMap.get(key));
                            }
                        }
                        O3_8h = (double)Math.round(O3_8hList.stream().mapToDouble(aDouble ->aDouble).summaryStatistics().getAverage());
                        if (i<curHour24){
                            O3_8h = (double)Math.round(O3_8hList.stream().mapToDouble(aDouble ->aDouble).summaryStatistics().getAverage());
                        }
                    }
                    oneGovMonitorPointOneHourData.put("O3_8h_"+govMonitorPointId,O3_8h);
                    switch (i){
@@ -461,7 +493,7 @@
                        pollutant = pollutant.replace("]","");
                        avgMap.put("pollutant",pollutant);
                    }else {
                        avgMap.put("pollutant","");
                        avgMap.put("pollutant","-");
                    }
                }else {
                    avgMap.put("aqi","");