From 85dba01ea5021d83487c3ed2d60706f516a0774b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 05 Jan 2022 14:40:28 +0800
Subject: [PATCH] 贡献率数据格式修改
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 8bfb783..536f9f5 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
@@ -167,6 +167,8 @@
lastDataWrapper.orderByDesc("time");
lastDataWrapper.last(true, "limit 1");
CityAqi cityAqi = cityAqiMapper.selectOne(lastDataWrapper);
+ if(cityAqi==null)
+ return null;
//���������24������������������
Date endDate = cityAqi.getTime();
Date startDate = DateUtils.addHours(endDate, -23);
@@ -935,8 +937,6 @@
result.put("month", monthMap);
//������������������������������
- sortByField(ranks, "compositeIndexYear");
- //���������������
sortByField(ranks, "compositeIndexYear");
Map<String, Object> yearMap = rankByField(ranks, cityCode, "compositeIndexYear", cityCodes.size());
if (ObjectUtils.isEmpty(yearMap)) {
--
Gitblit v1.8.0