From b3a7d3d28ee5934a4f3fdb89b50c681667440c68 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 20 Nov 2020 17:30:24 +0800
Subject: [PATCH] 导出数据接口update
---
src/main/java/com/moral/util/AQICalculation2.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/util/AQICalculation2.java b/src/main/java/com/moral/util/AQICalculation2.java
index 92d435c..050afdd 100644
--- a/src/main/java/com/moral/util/AQICalculation2.java
+++ b/src/main/java/com/moral/util/AQICalculation2.java
@@ -11,7 +11,7 @@
String key = entry.getKey();
if (entry.getValue() instanceof Double){
Double value = Double.parseDouble(entry.getValue().toString());
- if (key!="O3-8h"){
+ if (key!="O3_8h"){
maxMap.put(key,value);
}
Double PM2_5AQI;
@@ -30,13 +30,13 @@
case "SO2":SO2AQI = SO2AQI(value);
AQIList.add(SO2AQI);
break;
- case "e16":NO2AQI = NO2AQI(value);
+ case "NO2":NO2AQI = NO2AQI(value);
AQIList.add(NO2AQI);
break;
case "CO":COAQI = COAQI(value);
AQIList.add(COAQI);
break;
- case "O3":O3AQI = O3AQI(value);
+ case "maxO3_8h":O3AQI = O3AQI(value);
AQIList.add(O3AQI);
break;
@@ -50,11 +50,10 @@
Double AQIMAX = Collections.max(AQIList);
Map<String, Object> returnMap = new HashMap<>();
- //System.out.println("-------"+maxMap);
+
Optional<Map.Entry<String, Integer>> max0 = maxMap.entrySet()
.stream()
.max(Map.Entry.comparingByValue());
- //System.out.println("-------"+max0.get().getKey());
returnMap.put("maxSensor",max0.get().getKey());
returnMap.put("AQI", AQIMAX);
@@ -67,7 +66,7 @@
String key = entry.getKey();
if (entry.getValue() instanceof Double){
Double value = Double.parseDouble(entry.getValue().toString());
- if (key!="O3-day"){
+ if (key!="O3_day"){
maxMap.put(key,value);
}
Double PM2_5AQI;
@@ -86,13 +85,13 @@
case "SO2":SO2AQI = SO2DayAQI(value);
AQIList.add(SO2AQI);
break;
- case "e16":NO2AQI = NO2DayAQI(value);
+ case "NO2":NO2AQI = NO2DayAQI(value);
AQIList.add(NO2AQI);
break;
case "CO":COAQI = CODayAQI(value);
AQIList.add(COAQI);
break;
- case "O3":maxO38hAQI = O3DayAQI(value);
+ case "maxO3_8h":maxO38hAQI = O3DayAQI(value);
AQIList.add(maxO38hAQI);
break;
default:
@@ -105,11 +104,9 @@
Double AQIMAX = Collections.max(AQIList);
Map<String, Object> returnMap = new HashMap<>();
- System.out.println("-------"+maxMap);
Optional<Map.Entry<String, Integer>> max0 = maxMap.entrySet()
.stream()
.max(Map.Entry.comparingByValue());
- //System.out.println("-------"+max0.get().getKey());
returnMap.put("maxSensor",max0.get().getKey());
returnMap.put("AQI", AQIMAX);
--
Gitblit v1.8.0