|
@@ -546,8 +546,9 @@ class SmartSceneView(View):
|
|
|
scene_data = smart_scene_qs[0]['scene_data']
|
|
|
if scene_data:
|
|
|
scene_data_dict = eval(scene_data)
|
|
|
+ task_list = scene_data_dict.get('task_list')
|
|
|
no_device_task = scene_data_dict.get('no_device_task')
|
|
|
- if no_device_task is not None:
|
|
|
+ if no_device_task is not None and task_list:
|
|
|
# 无设备任务,需要scene_id上报场景日志
|
|
|
scene_id = smart_scene_id if no_device_task else 0
|
|
|
new_scene_data_dict = cls.pause_or_resume_job(scene_data_dict, scene_status, scene_id)
|
|
@@ -1169,14 +1170,12 @@ class SmartSceneView(View):
|
|
|
task_temp['value_type'] = task.get('value_type')
|
|
|
task_list.append(task_temp)
|
|
|
|
|
|
- # scene_task_list不为空,组织完整场景数据
|
|
|
- scene_data = ''
|
|
|
- if scene_task_list:
|
|
|
- scene_data = {
|
|
|
- 'condition': condition,
|
|
|
- 'task_list': scene_task_list,
|
|
|
- 'no_device_task': no_device_task
|
|
|
- }
|
|
|
+ # 组织完整场景数据
|
|
|
+ scene_data = {
|
|
|
+ 'condition': condition,
|
|
|
+ 'task_list': scene_task_list,
|
|
|
+ 'no_device_task': no_device_task
|
|
|
+ }
|
|
|
|
|
|
return task_list, scene_data
|
|
|
|