设备控制更新

smartfarming/views/counts_views.py

@@ -57,15 +57,15 @@ class LandPlanInfoAPIView(APIView):
         if years:
             end = datetime.datetime(int(years[-1]) -5, 12,31,23,59).timestamp()
             start = datetime.datetime(int(years[-1]), 12,31,23,59).timestamp()
-            plan_ids = LandPlanInfo.objects.filter(addtime__gte=end, addtime__lte=start).exclude(recovery_time=0).distinct().values_list("plan_id", flat=True).order_by("plan_id")
+            plan_ids = LandPlanInfo.objects.filter(recovery_time__gte=end, recovery_time__lte=start).exclude(recovery_time=0).distinct().values_list("plan_id", flat=True).order_by("plan_id")
             counts = []
             # 组织具体数据
             for i in years:
                 start_timestamp = datetime.datetime(i, 1,1,0,0).timestamp()
                 end_timestatmp = datetime.datetime(i, 12,31,23,59).timestamp()
                 plan_totals = LandPlanInfo.objects.filter(
-                    addtime__gte=start_timestamp, 
-                    addtime__lte=end_timestatmp).exclude(recovery_time=0).values("plan_id").annotate(total=Sum("recovery_kg")).order_by("plan_id").values_list("plan_id", "total")
+                    recovery_time__gte=start_timestamp, 
+                    recovery_time__lte=end_timestatmp).exclude(recovery_time=0).values("plan_id").annotate(total=Sum("recovery_kg")).order_by("plan_id").values_list("plan_id", "total")
                 # 作物 id：总质量
                 inners = {}
                 for k in plan_totals: