Эх сурвалжийг харах

修改scene_data保存的数据格式

locky 1 жил өмнө
parent
commit
3fc8737ec7

+ 1 - 4
Controller/SensorGateway/SmartSceneController.py

@@ -386,8 +386,7 @@ class SmartSceneView(View):
                     conditions_dict, is_set_time, minutes, repeat, tz, now_time, tasks_list)
                     conditions_dict, is_set_time, minutes, repeat, tz, now_time, tasks_list)
 
 
                 smart_scene_qs.device_data = json.dumps(msg)
                 smart_scene_qs.device_data = json.dumps(msg)
-                if scene_data:
-                    smart_scene_qs.scene_data = json.dumps(scene_data)
+                smart_scene_qs.scene_data = scene_data
                 smart_scene_qs.save()
                 smart_scene_qs.save()
 
 
                 # 设备任务列表不为空,发布MQTT消息通知网关设备
                 # 设备任务列表不为空,发布MQTT消息通知网关设备
@@ -727,8 +726,6 @@ class SmartSceneView(View):
             # 获取设备任务数据
             # 获取设备任务数据
             msg['task'], scene_data = cls.get_task_list_and_scene_data(
             msg['task'], scene_data = cls.get_task_list_and_scene_data(
                 conditions_dict, is_set_time, minutes, repeat, tz, now_time, tasks_list, scene_data_dict)
                 conditions_dict, is_set_time, minutes, repeat, tz, now_time, tasks_list, scene_data_dict)
-            if scene_data:
-                scene_data = json.dumps(scene_data)
 
 
             with transaction.atomic():
             with transaction.atomic():
                 smart_scene_qs.update(scene_name=scene_name, conditions=conditions, tasks=tasks, scene_data=scene_data,
                 smart_scene_qs.update(scene_name=scene_name, conditions=conditions, tasks=tasks, scene_data=scene_data,