|
|
@@ -12,7 +12,7 @@ from django.views.generic.base import View
|
|
|
|
|
|
from Controller.SensorGateway.EquipmentFamilyController import EquipmentFamilyView
|
|
|
from Model.models import FamilyRoomDevice, FamilyRoom, GatewaySubDevice, Device_Info, UserFamily, FamilyMember, \
|
|
|
- UidSetModel
|
|
|
+ UidSetModel, iotdeviceInfoModel
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
|
|
|
|
@@ -201,13 +201,23 @@ class GatewayDeviceView(View):
|
|
|
if room_id:
|
|
|
room_qs = FamilyRoom.objects.filter(id=room_id)
|
|
|
gateway_room_name = room_qs.first().name if room_qs.exists() else ''
|
|
|
+
|
|
|
+ iot_device_info_qs = iotdeviceInfoModel.objects.filter(serial_number=device_qs['device__serial_number'])
|
|
|
+ iot_data = {}
|
|
|
+ if iot_device_info_qs.exists():
|
|
|
+ iot_device_Info = iot_device_info_qs.values('endpoint', 'token_iot_number')
|
|
|
+ iot_data = {
|
|
|
+ 'endpoint': iot_device_Info[0]['endpoint'],
|
|
|
+ 'token_iot_number': iot_device_Info[0]['token_iot_number']
|
|
|
+ }
|
|
|
gateway = {
|
|
|
'deviceId': device_qs['device_id'],
|
|
|
'deviceType': device_qs['device__Type'],
|
|
|
'deviceNickName': device_qs['device__NickName'],
|
|
|
'UID': device_qs['device__UID'],
|
|
|
'serialNumber': device_qs['device__serial_number'],
|
|
|
- 'roomName': gateway_room_name
|
|
|
+ 'roomName': gateway_room_name,
|
|
|
+ 'iot': iot_data
|
|
|
}
|
|
|
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')
|
