From 419077ed2fb351cc77f6e155e07629b168762704 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 03 Nov 2021 13:26:38 +0800
Subject: [PATCH] city_aqi首要污染物计算
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 930eb58..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
@@ -22,6 +22,7 @@
import com.moral.util.DateUtils;
import com.moral.util.MathUtils;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -352,6 +353,10 @@
sortByField(ranks, "aqi");
//���������������
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"));
result.put("day", dayMap);
@@ -360,15 +365,22 @@
sortByField(ranks, "compositeIndexMonth");
//���������������
Map<String, Object> monthMap = rankByField(ranks, cityCode, "compositeIndexMonth", cityCodes.size());
+ 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("rank", null);
+ yearMap.put("size", null);
+ }
yearMap.put("compositeIndex", yearMap.remove("value"));
result.put("year", yearMap);
--
Gitblit v1.8.0