From 4c4b97b0fc6b418254b8b7c29e55c7ee8f39997b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 08 Oct 2021 10:05:56 +0800
Subject: [PATCH] 臭氧预测实测对比
---
screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
index 3f33fea..2a3c803 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
@@ -157,6 +157,7 @@
List<Double> NO2List_daliy = new ArrayList<>();
List<Double> COList_daliy = new ArrayList<>();
List<Double> O3_1hList_daliy = new ArrayList<>();
+ List<Double> O3_8hList_daliy = new ArrayList<>();
Map<Integer,Double> O3_1hMap = new HashMap<>();
for (int i=0; i<24; i++){
//������������Map���������������������������������������������������������������������������
@@ -247,6 +248,7 @@
for (Integer key:O3_1hMap.keySet()){
if (i-8<key && key<i+1){
O3_8hList.add(O3_1hMap.get(key));
+ O3_8hList_daliy.add(O3_1hMap.get(key));
}
}
O3_8h = (double)Math.round(O3_8hList.stream().mapToDouble(aDouble ->aDouble).summaryStatistics().getAverage());
@@ -305,6 +307,20 @@
break;
}
}
+ Double PM2_5Avg_daliy = (double)Math.round(PM2_5List_daliy.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
+ Double PM10Avg_daliy = (double)Math.round(PM10List_daliy.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
+ Double SO2Avg_daliy = (double)Math.round(SO2List_daliy.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
+ Double NO2Avg_daliy = (double)Math.round(NO2List_daliy.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
+ Double COAvg_daliy = new BigDecimal(COList_daliy.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage()).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
+ Double O3_1hAvg_daliy = (double)Math.round(O3_1hList_daliy.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
+ Double O3_8hAvg_daliy = (double)Math.round(O3_8hList_daliy.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage());
+ hour_AVG.put("a34004_"+govMonitorPointId,PM2_5Avg_daliy);
+ hour_AVG.put("a34002_"+govMonitorPointId,PM10Avg_daliy);
+ hour_AVG.put("a21026_"+govMonitorPointId,SO2Avg_daliy);
+ hour_AVG.put("a21004_"+govMonitorPointId,NO2Avg_daliy);
+ hour_AVG.put("a21005_"+govMonitorPointId,COAvg_daliy);
+ hour_AVG.put("a05024_"+govMonitorPointId,O3_1hAvg_daliy);
+ hour_AVG.put("O3_8h_"+govMonitorPointId,O3_8hAvg_daliy);
}
Map<Integer,Map<String,Object>> replaceDataMap = new HashMap<>();
replaceDataMap.put(0,hour_1);
@@ -438,16 +454,18 @@
}else {
avgMap.put("aqi","");
}
- if (!ObjectUtils.isEmpty(AQIResultMap.get("aqi"))){
- String pollutant = AQIResultMap.get("pollutant").toString();
- pollutant = pollutant.replace("[","");
- pollutant = pollutant.replace("]","");
- avgMap.put("pollutant",pollutant);
+ if (!ObjectUtils.isEmpty(AQIResultMap.get("pollutant"))){
+ if (Integer.parseInt(AQIResultMap.get("aqi").toString())>50){
+ String pollutant = AQIResultMap.get("pollutant").toString();
+ pollutant = pollutant.replace("[","");
+ pollutant = pollutant.replace("]","");
+ avgMap.put("pollutant",pollutant);
+ }else {
+ avgMap.put("pollutant","");
+ }
}else {
avgMap.put("aqi","");
}
- //System.out.println("==============="+pollutant);
- //avgMap.put("pullutant",StringUtils.join(aqi_pollutantMap.get("pollutant").toArray(), separator));
switch (i){
case 0:hour_1.putAll(avgMap);
break;
@@ -497,6 +515,8 @@
break;
case 23:hour_24.putAll(avgMap);
break;
+ case 24:hour_AVG.putAll(avgMap);
+ break;
default:
break;
}
@@ -525,7 +545,7 @@
hour_22.put("time","22���");
hour_23.put("time","23���");
hour_24.put("time","0���");
- hour_AVG.put("time","avg");
+ hour_AVG.put("time","������");
data.add(hour_1);
data.add(hour_2);
data.add(hour_3);
@@ -550,8 +570,10 @@
data.add(hour_22);
data.add(hour_23);
data.add(hour_24);
+ data.add(hour_AVG);
resultMap.put("title",date+"������");
resultMap.put("data",data);
+ govMonitorPointList.add(govMonitorPoint_avg);
resultMap.put("govMonitorPoint",govMonitorPointList);
return resultMap;
}catch (Exception e){
--
Gitblit v1.8.0