From 99e4079c52fd839087bc98ec6dc8b3cba7da36dd Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 11 Apr 2024 16:38:24 +0800
Subject: [PATCH] fix: equipment evdata add_info_for_list2

---
 apps/em/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/em/views.py b/apps/em/views.py
index cf9a45f9..7f824678 100644
--- a/apps/em/views.py
+++ b/apps/em/views.py
@@ -80,7 +80,8 @@ class EquipmentViewSet(CustomModelViewSet):
             from apps.enp.serializers import EnvDataSerializer
 
             # 子查询获取每个 equipment_id 对应的最大时间戳
-            last_time_subquery = EnvData.objects.filter(equipment_id=OuterRef("equipment_id"), time__gte=now_10_before, time__lte=now).order_by("-time").values("time")[:1]
+            # 后面可以考虑从缓存里拿
+            last_time_subquery = EnvData.objects.filter(equipment_id=OuterRef("equipment_id"), timex__gte=now_10_before, timex__lte=now).order_by("-timex").values("timex")[:1]
 
             # 主查询，获取每个 equipment_id 对应的完整记录
             last_envdata_qs = EnvData.objects.filter(equipment_id__in=data_ids, timex=Subquery(last_time_subquery))