From a4c84773afd8691ee95c48793e53480accab6886 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 02 Nov 2021 16:25:36 +0800
Subject: [PATCH] update
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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..a28cf90 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,25 +353,30 @@
sortByField(ranks, "aqi");
//���������������
Map<String, Object> dayMap = rankByField(ranks, cityCode, "aqi", cityCodes.size());
- dayMap.put("aqi", dayMap.remove("value"));
- result.put("day", dayMap);
+ if (!ObjectUtils.isEmpty(dayMap)) {
+ 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());
- monthMap.put("compositeIndex", monthMap.remove("value"));
- result.put("month", monthMap);
-
+ if (!ObjectUtils.isEmpty(monthMap)) {
+ 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());
- yearMap.put("compositeIndex", yearMap.remove("value"));
- result.put("year", yearMap);
+ if (!ObjectUtils.isEmpty(yearMap)) {
+ 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