Pārlūkot izejas kodu

首页设备查询(插座新增在线状态字段)

guanhailong 2 gadi atpakaļ
vecāks
revīzija
8daef20a2b

+ 5 - 1
Controller/SensorGateway/EquipmentFamilyController.py

@@ -20,7 +20,7 @@ from Controller.DeviceConfirmRegion import Device_Region
 from Controller.SensorGateway.SmartSocketController import SmartSocketView
 from Model.models import Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidChannelSetModel, \
     iotdeviceInfoModel, UIDModel, Device_User, UserFamily, FamilyMember, FamilyMemberPermission, \
-    FamilyRoomDevice, FamilyRoom, FamilyMemberJoin, GatewaySubDevice, CountryModel
+    FamilyRoomDevice, FamilyRoom, FamilyMemberJoin, GatewaySubDevice, CountryModel, SocketInfo
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
@@ -1069,6 +1069,10 @@ class EquipmentFamilyView(View):
                         else:
                             device_qs['data_joined'] = ''
                     if device_qs['Type'] == 200 or device_qs['Type'] == 201:
+                        if device_qs['Type'] == 201:
+                            socket_info_qs = SocketInfo.objects.filter(device_id=device_qs['id']).values(
+                                'status').first()
+                            device_qs['socketStatus'] = socket_info_qs['status']
                         gateways.append(device_qs)
                     else:
                         cameras.append(device_qs)