Ver código fonte

优化插座查询记录

zhangdongming 2 anos atrás
pai
commit
eb9a6a39f8
1 arquivos alterados com 4 adições e 4 exclusões
  1. 4 4
      Controller/SensorGateway/SmartSocketController.py

+ 4 - 4
Controller/SensorGateway/SmartSocketController.py

@@ -569,21 +569,21 @@ class SmartSocketView(View):
         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'})
+            return response.json(444, 'errno: page or size or serial_number')
         page, size = int(page), int(size)
 
         try:
             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')[(page - 1) * size:page * size]
+                    '-created_time', '-id')[(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(
-                    '-created_time')[(page - 1) * size:page * size]
+                    '-created_time','-id')[(page - 1) * size:page * size]
                 if not scene_log_qs.exists():
                     return response.json(0, [])
             log_list = []
@@ -883,4 +883,4 @@ class SmartSocketView(View):
         try:
             requests.post(url=url, data=data, timeout=5)
         except Exception as e:
-            print(repr(e))
+            print(repr(e))