|
@@ -351,11 +351,11 @@ class GatewaySubDeviceView(View):
|
|
if start_time and end_time:
|
|
if start_time and end_time:
|
|
sensor_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id,
|
|
sensor_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id,
|
|
created_time__range=(start_time, end_time)). \
|
|
created_time__range=(start_time, end_time)). \
|
|
- values('alarm', 'created_time').order_by('-created_time')[
|
|
|
|
|
|
+ values('alarm', 'event_type', 'created_time').order_by('-created_time')[
|
|
(page - 1) * size:page * size]
|
|
(page - 1) * size:page * size]
|
|
else:
|
|
else:
|
|
sensor_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id). \
|
|
sensor_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id). \
|
|
- values('alarm', 'created_time').order_by('-created_time')[
|
|
|
|
|
|
+ values('alarm', 'event_type', 'created_time').order_by('-created_time')[
|
|
(page - 1) * size:page * size]
|
|
(page - 1) * size:page * size]
|
|
if not sensor_record_qs.exists():
|
|
if not sensor_record_qs.exists():
|
|
return response.json(0, [])
|
|
return response.json(0, [])
|