智能场景日志修改返回数据

Controller/SensorGateway/SmartSceneController.py

@@ -727,9 +727,16 @@ class SmartSceneView(View):
                 return response.json(0, [])
             for item in scene_log_qs:
                 scene_id = item['scene_id']
-                smart_scene_qs = SmartScene.objects.filter(id=scene_id).values('scene_name', 'conditions', 'tasks')
+                smart_scene_qs = SmartScene.objects.filter(id=scene_id).values('scene_name', 'device_id', 'sub_device_id', 'tasks')
+                device_id = smart_scene_qs[0]['device_id']
+                sub_device_id = smart_scene_qs[0]['sub_device_id']
+                if device_id:
+                    qs = Device_Info.objects.filter(id=device_id).values('Type')
+                    item['device_type'] = qs[0]['Type']
+                else:
+                    qs = GatewaySubDevice.objects.filter(id=sub_device_id).values('device_type')
+                    item['device_type'] = qs[0]['device_type']
                 item['scene_name'] = smart_scene_qs[0]['scene_name']
-                item['conditions'] = smart_scene_qs[0]['conditions']
                 item['tasks'] = smart_scene_qs[0]['tasks']
             return response.json(0, list(scene_log_qs))
         except Exception as e: