智能场景日志返回所有日志

Controller/SensorGateway/SmartSceneController.py

@@ -705,33 +705,23 @@ class SmartSceneView(View):
         @param response: 响应对象
         @return: response
         """
-        device_id = request_dict.get('deviceId', None)
-        sub_device_id = request_dict.get('subDeviceId', None)
         page = request_dict.get('page', None)
         size = request_dict.get('size', None)
         start_time = request_dict.get('startTime', None)
         end_time = request_dict.get('endTime', None)
 
-        if not any([device_id, sub_device_id]):
-            return response.json(444, {'error param': 'deviceId and subDeviceId'})
         if not all([page, size]):
             return response.json(444, {'error param': 'page or size'})
 
-        device_dict = {}
-        if device_id:
-            device_dict['device_id'] = device_id
-        else:
-            device_dict['sub_device_id'] = sub_device_id
-
         try:
             page, size = int(page), int(size)
             if start_time and end_time:
-                scene_log_qs = SceneLog.objects.filter(**device_dict, created_time__range=(start_time, end_time)). \
+                scene_log_qs = SceneLog.objects.filter(created_time__range=(start_time, end_time)). \
                                    values('scene_id', 'status', 'created_time').order_by(
                     '-created_time')[(page - 1) * size:page * size]
             else:
-                scene_log_qs = SceneLog.objects.filter(**device_dict).values('scene_id', 'status',
-                                                                             'created_time').order_by(
+                scene_log_qs = SceneLog.objects.all().values('scene_id', 'status',
+                                                             'created_time').order_by(
                     '-created_time')[(page - 1) * size:page * size]
             if not scene_log_qs.exists():
                 return response.json(0, [])