From ff3af3a0dd0fe87a500c13e933bea1f553083508 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 21 Sep 2023 10:47:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java
index d3822e4..4e81d4e 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java
@@ -25,14 +25,7 @@
import java.text.DecimalFormat;
import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.OptionalDouble;
+import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.DoubleStream;
@@ -126,7 +119,7 @@
CityAqiMonthly cityAqiMonthly = cityAqiMonthlyMapper.selectOne(cityAqiMonthlyQueryWrapper);
Double compositeIndex = null;
String compositeIndexYearOnYear = null;
- Integer pm25 = null;
+ Double pm25 = null;
String pm25YearOnYear = null;
if (cityAqiMonthly != null) {
Map<String, Object> aqiMap = JSONObject.parseObject(cityAqiMonthly.getValue(), Map.class);
@@ -145,7 +138,7 @@
//3.PM2.5������
if (aqiMap.get("PM2_5") != null) {
- pm25 = Integer.parseInt(aqiMap.get("PM2_5").toString());
+ pm25 = Objects.nonNull(aqiMap.get("PM2_5"))?Double.parseDouble(aqiMap.get("PM2_5").toString()):0d;
}
currentRankingResult.put("PM2_5", pm25 + "ug/m��");
@@ -183,7 +176,7 @@
Map<Integer, Map<String, Object>> monthlyCumulativeResult = null;
Double cityCompositeIndex = null;
String cityCompositeIndexYearOnYear = null;
- Integer cityPM25 = null;
+ Double cityPM25 = null;
String cityPM25YearOnYear = null;
if (!"1".equals(month)) {
Map<String, Object> cumulativeRankingResult = new HashMap<>();
@@ -201,7 +194,7 @@
cityCompositeIndexYearOnYear = cityMap.get("compositeIndex_yearOnYear").toString();
}
//���������PM2.5
- cityPM25 = (int) Double.parseDouble(cityMap.get("PM2_5").toString());
+ cityPM25 = Double.parseDouble(cityMap.get("PM2_5").toString());
if (cityMap.get("PM2_5_yearOnYear") != null) {
cityPM25YearOnYear = cityMap.get("PM2_5_yearOnYear").toString();
}
@@ -944,7 +937,7 @@
* @param pm25YearOnYear ���������������������������pm2.5������
* @description ���������������������������������������������������������������������������
*/
- private Map<String, Object> getAreaCurrentMonthResult(Map<Integer, String> areasMap, List<CityAqiMonthly> areaData, Double compositeIndex, String compositeIndexYearOnYear, Integer pm25, String pm25YearOnYear) {
+ private Map<String, Object> getAreaCurrentMonthResult(Map<Integer, String> areasMap, List<CityAqiMonthly> areaData, Double compositeIndex, String compositeIndexYearOnYear, Double pm25, String pm25YearOnYear) {
Map<String, Object> result = new HashMap<>();
result.put("compositeIndex", compositeIndex);
result.put("compositeIndexYearOnYear", compositeIndexYearOnYear);
--
Gitblit v1.8.0