From 99beb83b1ed149b8b4445e828b55959fb68bee91 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 02 Nov 2021 16:41:33 +0800
Subject: [PATCH] 省内倒数排名数据结构update
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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..eb6fc95 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
@@ -355,8 +355,8 @@
Map<String, Object> dayMap = rankByField(ranks, cityCode, "aqi", cityCodes.size());
if (!ObjectUtils.isEmpty(dayMap)) {
dayMap.put("aqi", dayMap.remove("value"));
- result.put("day", dayMap);
}
+ result.put("day", dayMap);
//������������������������������
ranks.removeIf(o -> o.get("compositeIndexMonth") == null);
@@ -365,18 +365,18 @@
Map<String, Object> monthMap = rankByField(ranks, cityCode, "compositeIndexMonth", cityCodes.size());
if (!ObjectUtils.isEmpty(monthMap)) {
monthMap.put("compositeIndex", monthMap.remove("value"));
- result.put("month", monthMap);
}
+ result.put("month", monthMap);
//������������������������������
sortByField(ranks, "compositeIndexYear");
//���������������
sortByField(ranks, "compositeIndexYear");
Map<String, Object> yearMap = rankByField(ranks, cityCode, "compositeIndexYear", cityCodes.size());
- if (!ObjectUtils.isEmpty(yearMap)) {
+ if(!ObjectUtils.isEmpty(yearMap)){
yearMap.put("compositeIndex", yearMap.remove("value"));
- result.put("year", yearMap);
}
+ result.put("year", yearMap);
//���������������
result.put("time", DateUtils.dateToDateString(yesterday, DateUtils.yyyy_MM_dd_EN));
--
Gitblit v1.8.0