查询智能场景日志返回数据

Controller/SensorGateway/SmartSceneController.py

@@ -724,18 +724,20 @@ class SmartSceneView(View):
             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)). \
-                                   values('scene_id', 'scene_log', 'status', 'created_time').order_by(
+                                   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', 'scene_log', 'status',
+                scene_log_qs = SceneLog.objects.filter(**device_dict).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, [])
             for item in scene_log_qs:
                 scene_id = item['scene_id']
-                scene_name = SmartScene.objects.filter(id=scene_id)[0].scene_name
-                item['scene_name'] = scene_name
+                smart_scene_qs = SmartScene.objects.filter(id=scene_id).values('scene_name', 'conditions', 'tasks')
+                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:
             print(repr(e))

Model/models.py

@@ -2663,7 +2663,7 @@ class SceneLog(models.Model):
     sub_device_id = models.IntegerField(default=0, verbose_name='关联子设备id')
     scene_log = models.TextField(default='', verbose_name='场景日志')
     status = models.SmallIntegerField(default=0, verbose_name='场景状态')
-    created_time = models.IntegerField(default=0, verbose_name='创建时间')
+    created_time = models.IntegerField(default=0, verbose_name='场景触发时间')
 
     class Meta:
         db_table = 'scene_log'