From 972d4a3b006513380281965af515fd5f7275487d Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 05 Jan 2022 11:08:51 +0800
Subject: [PATCH] screen-api 修改查询24小时城市aqi接口BUG
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 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 9ab60a0..9343fb1 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
@@ -135,6 +135,21 @@
Map<String, Object> value = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.CITY_AQI, String.valueOf(regionCode));
if (value == null)
value = queryCityAqiByRegionCodeFromDB(regionCode);
+ //������������������������������������������������������������
+ if (value == null) {
+ String regionCodeStr = String.valueOf(regionCode);
+ String end = regionCodeStr.substring(regionCodeStr.length() - 2, regionCodeStr.length());
+ if (!end.equals(00)) {
+ regionCodeStr = regionCodeStr.substring(0, regionCodeStr.length() - 2);
+ regionCodeStr += "00";
+ regionCode = Integer.parseInt(regionCodeStr);
+ value = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.CITY_AQI, String.valueOf(regionCode));
+ if (value == null)
+ value = queryCityAqiByRegionCodeFromDB(regionCode);
+ }else{
+ return null;
+ }
+ }
//������AQI������������������
if (value == null || value.get("AQI") == null)
return null;
@@ -152,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);
@@ -754,7 +771,7 @@
/**
* @Description: ������6������������
* @Param: [cityAqiList]
- * @return: java.util.Map<java.lang.String, java.lang.Double>
+ * @return: java.util.Map<java.lang.String , java.lang.Double>
* ���������key���sensorCode,value������
* @Author: ���������
* @Date: 2021/11/2
@@ -808,7 +825,7 @@
/**
* @Description: ������������������������
* @Param: [regionCode]
- * @return: java.util.Map<java.lang.String, java.lang.Object>
+ * @return: java.util.Map<java.lang.String , java.lang.Object>
* @Author: ���������
* @Date: 2021/10/28
*/
--
Gitblit v1.8.0