From 9485a0cb33bb4535bb553a5bf49debeadbe0c89d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 03 Nov 2021 11:48:55 +0800
Subject: [PATCH] city_aqi o3_8h，综指，首要污染物计算
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 a28cf90..03b92c6 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
@@ -353,30 +353,36 @@
sortByField(ranks, "aqi");
//���������������
Map<String, Object> dayMap = rankByField(ranks, cityCode, "aqi", cityCodes.size());
- if (!ObjectUtils.isEmpty(dayMap)) {
- dayMap.put("aqi", dayMap.remove("value"));
- result.put("day", dayMap);
+ if (ObjectUtils.isEmpty(dayMap)) {
+ dayMap.put("rank", null);
+ dayMap.put("size", null);
}
+ dayMap.put("aqi", dayMap.remove("value"));
+ result.put("day", dayMap);
//������������������������������
ranks.removeIf(o -> o.get("compositeIndexMonth") == null);
sortByField(ranks, "compositeIndexMonth");
//���������������
Map<String, Object> monthMap = rankByField(ranks, cityCode, "compositeIndexMonth", cityCodes.size());
- if (!ObjectUtils.isEmpty(monthMap)) {
- monthMap.put("compositeIndex", monthMap.remove("value"));
- result.put("month", monthMap);
+ if (ObjectUtils.isEmpty(monthMap)) {
+ monthMap.put("rank", null);
+ monthMap.put("size", null);
}
+ monthMap.put("compositeIndex", monthMap.remove("value"));
+ result.put("month", monthMap);
//������������������������������
sortByField(ranks, "compositeIndexYear");
//���������������
sortByField(ranks, "compositeIndexYear");
Map<String, Object> yearMap = rankByField(ranks, cityCode, "compositeIndexYear", cityCodes.size());
- if (!ObjectUtils.isEmpty(yearMap)) {
- yearMap.put("compositeIndex", yearMap.remove("value"));
- result.put("year", yearMap);
+ if (ObjectUtils.isEmpty(yearMap)) {
+ yearMap.put("rank", null);
+ yearMap.put("size", null);
}
+ yearMap.put("compositeIndex", yearMap.remove("value"));
+ result.put("year", yearMap);
//���������������
result.put("time", DateUtils.dateToDateString(yesterday, DateUtils.yyyy_MM_dd_EN));
--
Gitblit v1.8.0