|
@@ -569,21 +569,21 @@ class SmartSocketView(View):
|
|
startTime = request_dict.get('startTime', None)
|
|
startTime = request_dict.get('startTime', None)
|
|
endTime = request_dict.get('endTime', None)
|
|
endTime = request_dict.get('endTime', None)
|
|
if not all([page, size, serial_number]):
|
|
if not all([page, size, serial_number]):
|
|
- return response.json(444, {'errno: page or size or serial_number'})
|
|
|
|
|
|
+ return response.json(444, 'errno: page or size or serial_number')
|
|
page, size = int(page), int(size)
|
|
page, size = int(page), int(size)
|
|
|
|
|
|
try:
|
|
try:
|
|
if startTime is None and endTime is None:
|
|
if startTime is None and endTime is None:
|
|
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').order_by(
|
|
'created_time').order_by(
|
|
- '-created_time')[(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, [])
|
|
else:
|
|
else:
|
|
scene_log_qs = SceneLog.objects.filter(device_id=serial_number, created_time__gte=startTime,
|
|
scene_log_qs = SceneLog.objects.filter(device_id=serial_number, created_time__gte=startTime,
|
|
created_time__lt=endTime).values('tasks', 'status',
|
|
created_time__lt=endTime).values('tasks', 'status',
|
|
'created_time').order_by(
|
|
'created_time').order_by(
|
|
- '-created_time')[(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, [])
|
|
log_list = []
|
|
log_list = []
|
|
@@ -883,4 +883,4 @@ class SmartSocketView(View):
|
|
try:
|
|
try:
|
|
requests.post(url=url, data=data, timeout=5)
|
|
requests.post(url=url, data=data, timeout=5)
|
|
except Exception as e:
|
|
except Exception as e:
|
|
- print(repr(e))
|
|
|
|
|
|
+ print(repr(e))
|