|
@@ -222,7 +222,7 @@ class GatewaySubDeviceView(View):
|
|
start_time = now_time - 24 * 60 * 60
|
|
start_time = now_time - 24 * 60 * 60
|
|
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, now_time)). \
|
|
created_time__range=(start_time, now_time)). \
|
|
- values('alarm', 'created_time').order_by('-created_time')
|
|
|
|
|
|
+ values('alarm', 'created_time').order_by('created_time')
|
|
if not sensor_record_qs.exists():
|
|
if not sensor_record_qs.exists():
|
|
return response.json(0)
|
|
return response.json(0)
|
|
|
|
|
|
@@ -243,7 +243,7 @@ class GatewaySubDeviceView(View):
|
|
start_time = now_time - 24 * 60 * 60 * 7
|
|
start_time = now_time - 24 * 60 * 60 * 7
|
|
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, now_time)). \
|
|
created_time__range=(start_time, now_time)). \
|
|
- values('alarm', 'created_time').order_by('-created_time')
|
|
|
|
|
|
+ values('alarm', 'created_time').order_by('created_time')
|
|
if not sensor_record_qs.exists():
|
|
if not sensor_record_qs.exists():
|
|
return response.json(0)
|
|
return response.json(0)
|
|
|
|
|
|
@@ -261,7 +261,7 @@ class GatewaySubDeviceView(View):
|
|
start_time = now_time - 24 * 60 * 60 * 30
|
|
start_time = now_time - 24 * 60 * 60 * 30
|
|
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, now_time)). \
|
|
created_time__range=(start_time, now_time)). \
|
|
- values('alarm', 'created_time').order_by('-created_time')
|
|
|
|
|
|
+ values('alarm', 'created_time').order_by('created_time')
|
|
if not sensor_record_qs.exists():
|
|
if not sensor_record_qs.exists():
|
|
return response.json(0)
|
|
return response.json(0)
|
|
|
|
|