|
@@ -594,19 +594,20 @@ class SmartSceneView(View):
|
|
try:
|
|
try:
|
|
page, size = int(page), int(size)
|
|
page, size = int(page), int(size)
|
|
if start_time and end_time:
|
|
if start_time and end_time:
|
|
- sensor_record_qs = SceneLog.objects.filter(**device_dict, created_time__range=(start_time, end_time)). \
|
|
|
|
- values('scene_id', 'scene_log', 'status', 'created_time').order_by(
|
|
|
|
|
|
+ scene_log_qs = SceneLog.objects.filter(**device_dict, created_time__range=(start_time, end_time)). \
|
|
|
|
+ values('scene_id', 'scene_log', 'status', 'created_time').order_by(
|
|
'-created_time')[(page - 1) * size:page * size]
|
|
'-created_time')[(page - 1) * size:page * size]
|
|
else:
|
|
else:
|
|
- sensor_record_qs = SceneLog.objects.filter(**device_dict).values('scene_id', 'scene_log', 'status',
|
|
|
|
- 'created_time').order_by(
|
|
|
|
|
|
+ scene_log_qs = SceneLog.objects.filter(**device_dict).values('scene_id', 'scene_log', 'status',
|
|
|
|
+ 'created_time').order_by(
|
|
'-created_time')[(page - 1) * size:page * size]
|
|
'-created_time')[(page - 1) * size:page * size]
|
|
- if not sensor_record_qs.exists():
|
|
|
|
|
|
+ if not scene_log_qs.exists():
|
|
return response.json(0, [])
|
|
return response.json(0, [])
|
|
- for item in sensor_record_qs:
|
|
|
|
|
|
+ for item in scene_log_qs:
|
|
scene_id = item['scene_id']
|
|
scene_id = item['scene_id']
|
|
scene_name = SmartScene.objects.filter(id=scene_id)[0].scene_name
|
|
scene_name = SmartScene.objects.filter(id=scene_id)[0].scene_name
|
|
item['scene_name'] = scene_name
|
|
item['scene_name'] = scene_name
|
|
- return response.json(0, list(sensor_record_qs))
|
|
|
|
|
|
+ return response.json(0, list(scene_log_qs))
|
|
except Exception as e:
|
|
except Exception as e:
|
|
|
|
+ print(repr(e))
|
|
return response.json(500, repr(e))
|
|
return response.json(500, repr(e))
|