|
@@ -115,8 +115,9 @@ class SmartSceneView(View):
|
|
|
else: # 智能按钮返回网关,门磁和人体传感器(如果存在)
|
|
|
gateway_data = cls.get_gateway_data(device_id)
|
|
|
sub_device_qs = GatewaySubDevice.objects.filter(
|
|
|
- Q(device_id=device_id) & Q(device_type=SENSOR_TYPE['door_magnet']) | Q(
|
|
|
- device_type=SENSOR_TYPE['body_sensor'])).values('id', 'nickname', 'status', 'device_type')
|
|
|
+ Q(Q(device_id=device_id) & Q(device_type=SENSOR_TYPE['door_magnet'])) |
|
|
|
+ Q(Q(device_id=device_id) & Q(device_type=SENSOR_TYPE['body_sensor']))
|
|
|
+ ).values('id', 'nickname', 'status', 'device_type')
|
|
|
if sub_device_qs.exists():
|
|
|
res = cls.get_sub_device_room_name(sub_device_qs, gateway_data)
|
|
|
else:
|