zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: equipment evdata add_info_for_list2

This commit is contained in:
caoqianming 2024-04-11 16:38:24 +08:00
parent d191a18f7b
commit 99e4079c52
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/em/views.py
View File

@ -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))