添加条件-查询设备接口响应数据增加子设备id

Controller/SensorGateway/SmartSceneController.py

@@ -74,12 +74,12 @@ class SmartSceneView(View):
             gateway_sub_device_qs = GatewaySubDevice.objects.filter(device_id=device_id)
             if not gateway_sub_device_qs.exists():
                 return response.json(173)
-            gateway_sub_device_qs = gateway_sub_device_qs.annotate(deviceType=F('device_type'),
+            gateway_sub_device_qs = gateway_sub_device_qs.annotate(gatewaySubId=F('id'), deviceType=F('device_type'),
                                                                    deviceNickName=F('nickname')).\
-                values('id', 'deviceType', 'deviceNickName', 'status')
+                values('gatewaySubId', 'deviceType', 'deviceNickName', 'status')
             sub_device_list = []
             for gateway_sub_device in gateway_sub_device_qs:
-                family_room_device_qs = FamilyRoomDevice.objects.filter(sub_device=gateway_sub_device['id']).\
+                family_room_device_qs = FamilyRoomDevice.objects.filter(sub_device=gateway_sub_device['gatewaySubId']).\
                     values('room_id')
                 if not family_room_device_qs.exists():
                     gateway_sub_device['roomName'] = ''
@@ -89,7 +89,6 @@ class SmartSceneView(View):
                         gateway_sub_device['roomName'] = FamilyRoom.objects.get(id=room_id).name
                     except ObjectDoesNotExist:
                         gateway_sub_device['roomName'] = ''
-                gateway_sub_device.pop('id')
                 sub_device_list.append(gateway_sub_device)
             return response.json(0, sub_device_list)
         except Exception as e:
@@ -167,9 +166,10 @@ class SmartSceneView(View):
         room_id_qs = FamilyRoom.objects.filter(id=room_id).values('name')
         room_name = room_id_qs.first()['name'] if room_id_qs.exists() else ''
         res = {
-            'nickname': nickname,
-            'device_type': device_type,
-            'room_name': room_name,
+            'deviceNickName': nickname,
+            'deviceType': device_type,
+            'roomName': room_name,
+            'status': 1,
         }
         return res