|
@@ -246,7 +246,12 @@ class SmartSceneView(View):
|
|
|
if not device_info_qs.exists():
|
|
|
return response.json(173)
|
|
|
serial_number = device_info_qs[0]['serial_number']
|
|
|
+
|
|
|
+ # 网关数据
|
|
|
+ msg['sensor_type'] = 200
|
|
|
msg['sensor_status'] = 2002
|
|
|
+ msg['sensor_ieee_addr'] = 'FFFFFFFFFFFFFFFF'
|
|
|
+
|
|
|
else: # 子设备设置场景
|
|
|
if not sub_device_id:
|
|
|
return response.json(444, {'error param': 'subDeviceId'})
|
|
@@ -628,7 +633,10 @@ class SmartSceneView(View):
|
|
|
if not device_qs.exists():
|
|
|
return response.json(173)
|
|
|
serial_number = device_qs[0]['serial_number']
|
|
|
+ # 网关数据
|
|
|
+ msg['sensor_type'] = 200
|
|
|
msg['sensor_status'] = 2002
|
|
|
+ msg['sensor_ieee_addr'] = 'FFFFFFFFFFFFFFFF'
|
|
|
|
|
|
# 获取设备任务数据
|
|
|
msg['task'] = cls.get_msg_task_list(tasks_list)
|
|
@@ -993,9 +1001,8 @@ class SmartSceneView(View):
|
|
|
if sub_device_id:
|
|
|
sub_device_qs = GatewaySubDevice.objects.filter(id=sub_device_id).values('ieee_addr').first()
|
|
|
task_temp['sensor_ieee_addr'] = sub_device_qs['ieee_addr']
|
|
|
- # 网关长地址返回'FFFFFFFFFFFFFFFF',添加报警类型数据
|
|
|
+ # 网关添加报警类型数据
|
|
|
else:
|
|
|
- task_temp['sensor_ieee_addr'] = 'FFFFFFFFFFFFFFFF'
|
|
|
task_temp['voice_type'] = task.get('voice_type')
|
|
|
task_temp['voice_id'] = task.get('voice_id')
|
|
|
task_temp['count'] = task.get('count')
|