Browse Source

修改创建场景和编辑场景延时数据

locky 3 năm trước cách đây
mục cha
commit
9a7028cdcb

+ 10 - 2
Controller/SensorGateway/SmartSceneController.py

@@ -237,7 +237,6 @@ class SmartSceneView(View):
                 if not device_info_qs.exists():
                 if not device_info_qs.exists():
                     return response.json(173)
                     return response.json(173)
                 serial_number = device_info_qs[0]['serial_number']
                 serial_number = device_info_qs[0]['serial_number']
-                msg['sensor_delay'] = tasks_list[0]['delay_time']
             else:  # 子设备设置场景
             else:  # 子设备设置场景
                 if not sub_device_id:
                 if not sub_device_id:
                     return response.json(444, {'error param': 'subDeviceId'})
                     return response.json(444, {'error param': 'subDeviceId'})
@@ -320,6 +319,11 @@ class SmartSceneView(View):
                         'sensor_type': int(task['device_type']),
                         'sensor_type': int(task['device_type']),
                         'sensor_action': int(task['event_type'])
                         'sensor_action': int(task['event_type'])
                     }
                     }
+
+                    # 延时
+                    if 'delay_time' in task and task['delay_time'] != 0:
+                        task_temp['sensor_delay'] = task['delay_time']
+
                     sub_device_id = task.get('subDeviceId', None)
                     sub_device_id = task.get('subDeviceId', None)
                     if sub_device_id:
                     if sub_device_id:
                         sub_device_qs = GatewaySubDevice.objects.filter(id=sub_device_id).values('src_addr').first()
                         sub_device_qs = GatewaySubDevice.objects.filter(id=sub_device_id).values('src_addr').first()
@@ -608,7 +612,6 @@ class SmartSceneView(View):
                 if not device_qs.exists():
                 if not device_qs.exists():
                     return response.json(173)
                     return response.json(173)
                 serial_number = device_qs[0]['serial_number']
                 serial_number = device_qs[0]['serial_number']
-                msg['sensor_delay'] = tasks_list[0]['delay_time']
 
 
             task_list = []
             task_list = []
             for task in tasks_list:
             for task in tasks_list:
@@ -616,6 +619,11 @@ class SmartSceneView(View):
                     'sensor_type': int(task['device_type']),
                     'sensor_type': int(task['device_type']),
                     'sensor_action': int(task['event_type'])
                     'sensor_action': int(task['event_type'])
                 }
                 }
+
+                # 延时
+                if 'delay_time' in task and task['delay_time'] != 0:
+                    task_temp['sensor_delay'] = task['delay_time']
+
                 task_sub_device_id = task.get('subDeviceId', None)
                 task_sub_device_id = task.get('subDeviceId', None)
                 if task_sub_device_id:
                 if task_sub_device_id:
                     sub_device_qs = GatewaySubDevice.objects.filter(id=task_sub_device_id).values('src_addr').first()
                     sub_device_qs = GatewaySubDevice.objects.filter(id=task_sub_device_id).values('src_addr').first()