查询子设备信息接口增加房间条件查询

Controller/SensorGateway/SubDeviceController.py

@@ -534,12 +534,15 @@ class GatewaySubDeviceView(View):
         @return: response
         """
         family_id = request_dict.get('familyId', None)
+        room_id = request_dict.get('roomId', None)
         if not family_id:
-            return response.json(444, {'error param': 'family_id'})
+            return response.json(444, {'error param': 'familyId'})
 
         try:
             family_room_device_qs = FamilyRoomDevice.objects.filter(Q(family_id=family_id), ~Q(sub_device=0)).values(
                 'sub_device', 'room_id').order_by('sort')
+            if room_id:
+                family_room_device_qs = family_room_device_qs.filter(room_id=room_id)
             device_list = []
             for item in family_room_device_qs:
                 room_qs = FamilyRoom.objects.filter(id=item['room_id']).values('name')