|
|
@@ -504,17 +504,27 @@ class SmartSocketView(View):
|
|
|
@return: response
|
|
|
# 日誌擦護用序列號查詢
|
|
|
"""
|
|
|
- page = request_dict.get('pageNo', None)
|
|
|
- size = request_dict.get('pageSize', None)
|
|
|
+ page = request_dict.get('page', None)
|
|
|
+ size = request_dict.get('size', None)
|
|
|
serial_number = request_dict.get('serialNumber', None)
|
|
|
+ startTime = request_dict.get('startTime', None)
|
|
|
+ endTime = request_dict.get('endTime', None)
|
|
|
if not all([page, size, serial_number]):
|
|
|
return response.json(444, {'errno: page or size or serial_number'})
|
|
|
page, size = int(page), int(size)
|
|
|
- scene_log_qs = SceneLog.objects.filter(device_id=serial_number).values('tasks', 'status',
|
|
|
- 'created_time').order_by(
|
|
|
- '-created_time')[(page - 1) * size:page * size]
|
|
|
- if not scene_log_qs.exists():
|
|
|
- return response.json(173)
|
|
|
+ if not startTime and endTime:
|
|
|
+ scene_log_qs = SceneLog.objects.filter(device_id=serial_number).values('tasks', 'status',
|
|
|
+ 'created_time').order_by(
|
|
|
+ '-created_time')[(page - 1) * size:page * size]
|
|
|
+ if not scene_log_qs.exists():
|
|
|
+ return response.json(173)
|
|
|
+ else:
|
|
|
+ scene_log_qs = SceneLog.objects.filter(device_id=serial_number, created_time__gte=startTime,
|
|
|
+ created_time__lt=endTime).values('tasks', 'status',
|
|
|
+ 'created_time').order_by(
|
|
|
+ '-created_time')[(page - 1) * size:page * size]
|
|
|
+ if not scene_log_qs.exists():
|
|
|
+ return response.json(0, [])
|
|
|
try:
|
|
|
log_list = []
|
|
|
for scene_log in scene_log_qs:
|
