From d5c9e3c98aee0f165e8f77938bcb5f0a37d48c87 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 04 Nov 2021 08:42:37 +0800
Subject: [PATCH] update
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
index 944e560..e405261 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -89,7 +89,7 @@
Date date = (Date) forecastDatum.get("time");
String value = forecastDatum.get("value").toString();
Map<String, Object> data = JSONObject.parseObject(value, Map.class);
- Object o3 = data.get("o3");
+ Object o3 = data.get("O3");
if (i == DateUtils.getHour(date) * 2) {
if (!ObjectUtils.isEmpty(o3)) {
map.put("O3", o3);
@@ -104,7 +104,7 @@
Date date = (Date) measuredDatum.get("time");
String value = measuredDatum.get("value").toString();
Map<String, Object> data = JSONObject.parseObject(value, Map.class);
- Object o3 = data.get("o3");
+ Object o3 = data.get("O3");
if (i == (DateUtils.getHour(date) * 2 + 1)) {
if (!ObjectUtils.isEmpty(o3)) {
map.put("O3", o3);
@@ -312,9 +312,8 @@
if (!ObjectUtils.isEmpty(one)) {
String value = one.getValue();
Map<String, Object> valueMap = JSONObject.parseObject(value, Map.class);
- rankMap.put("aqi", valueMap.get("aqi"));
+ rankMap.put("AQI", valueMap.get("AQI"));
}
-
//2.������������������������������������������������
queryWrapper.clear();
@@ -353,15 +352,15 @@
}
//���������������aqi������
- ranks.removeIf(o -> o.get("aqi") == null);
- sortByField(ranks, "aqi");
+ ranks.removeIf(o -> o.get("AQI") == null);
+ sortByField(ranks, "AQI");
//���������������
- Map<String, Object> dayMap = rankByField(ranks, cityCode, "aqi", cityCodes.size());
+ Map<String, Object> dayMap = rankByField(ranks, cityCode, "AQI", cityCodes.size());
if (ObjectUtils.isEmpty(dayMap)) {
dayMap.put("rank", null);
dayMap.put("size", null);
}
- dayMap.put("aqi", dayMap.remove("value"));
+ dayMap.put("AQI", dayMap.remove("value"));
result.put("day", dayMap);
//������������������������������
--
Gitblit v1.8.0