|
|
@@ -193,10 +193,12 @@ class GatewayDeviceView(View):
|
|
|
if not device_qs.exists():
|
|
|
return response.json(173)
|
|
|
try:
|
|
|
- device_qs = device_qs.values('device_id', 'room_id', 'device__Type', 'device__NickName', 'device__UID',
|
|
|
+ device_qs = device_qs.values('family_id', 'device_id', 'room_id', 'device__Type', 'device__NickName',
|
|
|
+ 'device__UID',
|
|
|
'device__serial_number')
|
|
|
device_qs = device_qs.first()
|
|
|
room_id = device_qs['room_id']
|
|
|
+ family_id = device_qs['family_id']
|
|
|
gateway_room_name = ''
|
|
|
if room_id:
|
|
|
room_qs = FamilyRoom.objects.filter(id=room_id)
|
|
|
@@ -218,7 +220,8 @@ class GatewayDeviceView(View):
|
|
|
'UID': device_qs['device__UID'],
|
|
|
'serialNumber': device_qs['device__serial_number'],
|
|
|
'roomName': gateway_room_name,
|
|
|
- 'iot': iot_data
|
|
|
+ 'iot': iot_data,
|
|
|
+ 'familyId': family_id
|
|
|
}
|
|
|
family_device_qs = FamilyRoomDevice.objects.filter(device_id=device_id)
|
|
|
family_device_qs = family_device_qs.filter(~Q(sub_device=0)).order_by('-created_time')
|
|
|
@@ -245,7 +248,8 @@ class GatewayDeviceView(View):
|
|
|
'status': gateway_sub_qs['status'],
|
|
|
'createdTime': gateway_sub_qs['created_time'],
|
|
|
'roomName': gateway_room_name,
|
|
|
- 'ieeeAddr': gateway_sub_qs['ieee_addr']
|
|
|
+ 'ieeeAddr': gateway_sub_qs['ieee_addr'],
|
|
|
+ 'familyId': family_id,
|
|
|
})
|
|
|
return response.json(0, {'gateway': gateway, 'sub_device': sub_device})
|
|
|
|
