网关更新

Controller/SensorGateway/EquipmentFamilyController.py

@@ -147,7 +147,7 @@ class EquipmentFamilyView(View):
         # type 可能为0
         if not all([nick_name, serial_number, device_type]):
             return response.json(444, {'param': 'nick_name, serial_number, device_type'})
-        device_info_qs = Device_Info.objects.filter(serial_number=serial_number, userID_id=user_id)
+        device_info_qs = Device_Info.objects.filter(serial_number=serial_number)
         if device_info_qs:
             # 判断设备是否已存在
             if device_info_qs[0].isExist == 1:

Controller/SensorGateway/GatewayDeviceController.py

@@ -236,6 +236,8 @@ class GatewayDeviceView(View):
                         'nickname',
                         'src_addr', 'status',
                         'created_time', 'ieee_addr')
+                    if not gateway_sub_qs.exists():
+                        continue
                     room_id = item['room_id']
                     room_qs = FamilyRoom.objects.filter(id=room_id)
                     gateway_room_name = room_qs.first().name if room_qs.exists() else ''