update

apps/Weather/views.py

@@ -2,7 +2,7 @@ import traceback
 from rest_framework.views import APIView
 from rest_framework.response import Response
 from django.contrib.auth import authenticate
-from apps.Weather.models import DayData, ServerDayData, AddressInfo, HistoryData
+from apps.Weather.models import DayData, ServerDayData, AddressInfo, HistoryDayData
 from apps.UserApp.models import MyUser
 
 import logging
@@ -114,20 +114,23 @@ class HistoryAPIView(APIView):
         province = data.get("province")
         city = data.get("city")
         district = data.get("district")
-        district = AddressInfo.objects.filter(province=province, city=city, district=district)
-        if district:
-            cityid = district.first().cityid
+        daydata = DayData.objects.filter(province=province, city=city, district=district)
+        if daydata:
+            cityid = daydata.first().cityid
         else:
             msg = f"地区：{district} 取不到，使用 {province} {city} 取"
-            logging.warning(msg)
-            city = AddressInfo.objects.filter(province=province, city=city)
-            if city:
+            print(msg)
+            daydata = DayData.objects.filter(province=province, city=city)
+            if daydata:
                 cityid = city.first().cityid
             else:
+                daydata = DayData.objects.filter(province=province)
+                if daydata:
+                    cityid = daydata.first().cityid
                 return Response({"msg": "暂无数据", "code": 500})
         # 去历史表中查询数据
         try:
-            history_data = HistoryData.objects.get(cityid=cityid, timestamp=int(timestamp))
+            history_data = HistoryDayData.objects.get(cityid=cityid, timestamp=int(timestamp))
             content = history_data.content
             low_heigh = json.loads(content)
             return Response(
@@ -150,20 +153,20 @@ class TestAPI(APIView):
         province = data.get("province")
         city = data.get("city")
         district = data.get("district")
-        address = AddressInfo.objects.filter(province=province, city=city, district=district)
+        address = DayData.objects.filter(province=province, city=city, district=district)
         cityid = None
         if address:
             cityid = address.first().cityid
         else:
-            address = AddressInfo.objects.filter(province=province, city=city)
+            address = DayData.objects.filter(province=province, city=city)
             if address:
                 cityid = address.first().cityid
             else:
-                address = AddressInfo.objects.filter(province=province)
+                address = DayData.objects.filter(province=province)
                 if address:
                     cityid = address.first().cityid
         if cityid:
-            data = HistoryData.objects.filter(cityid=cityid).filter(timestamp__gte=timestamp)[:7]
+            data = HistoryDayData.objects.filter(cityid=int(cityid)).filter(timestamp__gte=timestamp)[:7]
             return Response(
                 {
                     "data": [item.content for item in data],