|
@@ -579,14 +579,14 @@ class SmartSocketView(View):
|
|
|
|
|
|
try:
|
|
try:
|
|
scene_log_qs = SceneLog.objects.filter(device_id=serial_number).values('tasks', 'status',
|
|
scene_log_qs = SceneLog.objects.filter(device_id=serial_number).values('tasks', 'status',
|
|
- 'created_time').distinct()
|
|
|
|
|
|
+ 'created_time')
|
|
if startTime is None and endTime is None:
|
|
if startTime is None and endTime is None:
|
|
scene_log_qs = scene_log_qs.order_by('-created_time')[(page - 1) * size:page * size]
|
|
scene_log_qs = scene_log_qs.order_by('-created_time')[(page - 1) * size:page * size]
|
|
if not scene_log_qs.exists():
|
|
if not scene_log_qs.exists():
|
|
return response.json(0, [])
|
|
return response.json(0, [])
|
|
else:
|
|
else:
|
|
scene_log_qs = scene_log_qs.filter(device_id=serial_number, created_time__gte=startTime,
|
|
scene_log_qs = scene_log_qs.filter(device_id=serial_number, created_time__gte=startTime,
|
|
- created_time__lt=endTime).order_by(
|
|
|
|
|
|
+ created_time__lt=endTime).order_by(
|
|
'-created_time', '-id')[(page - 1) * size:page * size]
|
|
'-created_time', '-id')[(page - 1) * size:page * size]
|
|
if not scene_log_qs.exists():
|
|
if not scene_log_qs.exists():
|
|
return response.json(0, [])
|
|
return response.json(0, [])
|