|
@@ -528,9 +528,14 @@ class EquipmentInfoService:
|
|
|
'device_user_id': user_id,
|
|
|
'event_time__range': (start_time, end_time),
|
|
|
}
|
|
|
- event_type_kwargs = {}
|
|
|
+ event_type_kwargs = {
|
|
|
+ 'device_user_id': user_id,
|
|
|
+ 'event_time__range': (start_time, end_time),
|
|
|
+ }
|
|
|
if uid_list:
|
|
|
kwargs['device_uid__in'] = uid_list
|
|
|
+ event_type_kwargs['device_uid__in'] = uid_list
|
|
|
+ event_type_list = []
|
|
|
if event_type:
|
|
|
# 多类型查询
|
|
|
event_type_list = cls.get_comb_event_type(event_type)
|
|
@@ -543,7 +548,7 @@ class EquipmentInfoService:
|
|
|
elif tags:
|
|
|
kwargs['event_tag__regex'] = tags
|
|
|
|
|
|
- if not event_type_kwargs:
|
|
|
+ if not event_type_list:
|
|
|
# 新增tab_val字段记录表的标识:表编号+10
|
|
|
equipment_info_1 = EquipmentInfo1.objects.filter(**kwargs).annotate(tab_val=Value('11', output_field=CharField()))
|
|
|
equipment_info_2 = EquipmentInfo2.objects.filter(**kwargs).annotate(tab_val=Value('12', output_field=CharField()))
|