From 6450fec60b8dc7e6d31779bcfe3b23b3f665ebaf Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 28 Dec 2021 15:08:45 +0800
Subject: [PATCH] screen-api            更新单位转换代码

---
 screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java |   19 +++++++++++++++++--
 1 files changed, 17 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..8bfb783 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;
@@ -754,7 +769,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 +823,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