查询智能插座开关记录移除重复关键字

Controller/SensorGateway/SmartSocketController.py

@@ -578,16 +578,15 @@ class SmartSocketView(View):
         page, size = int(page), int(size)
 
         try:
+            scene_log_qs = SceneLog.objects.filter(device_id=serial_number).values('tasks', 'status',
+                                                                                   'created_time')
             if startTime is None and endTime is None:
-                scene_log_qs = SceneLog.objects.filter(device_id=serial_number).values('tasks', 'status',
-                                                                                       'created_time').order_by(
-                    '-created_time', '-id')[(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():
                     return response.json(0, [])
             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(
+                scene_log_qs = scene_log_qs.filter(device_id=serial_number, created_time__gte=startTime,
+                                                   created_time__lt=endTime).order_by(
                     '-created_time', '-id')[(page - 1) * size:page * size]
                 if not scene_log_qs.exists():
                     return response.json(0, [])
@@ -602,7 +601,7 @@ class SmartSocketView(View):
                 log_list.append(data)
             return response.json(0, log_list)
         except Exception as e:
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     @classmethod
     def splittings_time(cls, startTime, endTime, unit):