获取不到区级天气,使用市级天气数据

Controller/DetectController.py

@@ -25,7 +25,6 @@ from pyfcm import FCMNotification
 from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, DETECT_PUSH_DOMAIN, \
     JPUSH_CONFIG, FCM_CONFIG, APNS_CONFIG, \
     BASE_DIR, APNS_MODE, SERVER_TYPE, LOGGER
-from Ansjer.config import PUSH_REDIS_ADDRESS
 from Model.models import Device_Info, Equipment_Info, UidSetModel, UidPushModel, SysMsgModel, \
     VodBucketModel
 from Object.ETkObject import ETkObject

Controller/EquipmentManager.py

@@ -12,7 +12,6 @@ from django.db.models import Q
 from django.utils import timezone
 
 from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY, BASE_DIR
-from Ansjer.config import PUSH_REDIS_ADDRESS
 from Controller.DetectController import DetectControllerView
 from Controller.DeviceShare import DeviceShareView
 from Model.models import Device_User, Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidPushModel, \

Controller/ShadowController.py

@@ -208,8 +208,16 @@ def get_district(ip):
     ip_addr_qs = IPAddr.objects.filter(ip=ip, is_geoip2=False).values('district', 'city')
     if ip_addr_qs.exists():
         district = ip_addr_qs[0]['district']
+        city = ip_addr_qs[0]['city']
+        # 区级信息为空或city_information表查询不到区级信息,使用城市数据
         if district == '':
-            district = ip_addr_qs[0]['city']
+            district = city
+        else:
+            city_information_qs = CityInformation.objects.filter(district=district)
+            if not city_information_qs.exists():
+                city_qs = CityInformation.objects.filter(district=city)
+                if city_qs.exists():
+                    district = city
     else:
         ip_qs = IPQuery(ip)
         district = ip_qs.district