修改查询其他分组设备接口

Controller/DeviceManagement/DeviceGroupController.py

@@ -73,7 +73,7 @@ class DeviceGroupView(View):
         device_group_id = request_dict.get('device_group_id', None)
         if not device_group_id:
             return response.json(444)
-        device_info_qs = Device_Info.objects.filter(device_group_id=device_group_id).values('NickName')
+        device_info_qs = Device_Info.objects.filter(device_group_id=device_group_id).values('NickName', 'Type')
         if not device_info_qs.exists():
             return response.json(0)
         res = list(device_info_qs)
@@ -92,19 +92,33 @@ class DeviceGroupView(View):
         if not device_group_id:
             return response.json(444)
         try:
+            res = []
+            # 查询全部设备
+            if device_group_id != '0':
+                device_info_qs = Device_Info.objects.filter(userID=user_id). \
+                    values('id', 'NickName', 'Type')
+                if device_info_qs.exists():
+                    data = {
+                        'id': 0,
+                        'group_name': 'all'
+                    }
+                    device_info_list = []
+                    for device_info in device_info_qs:
+                        device_info_list.append(device_info)
+                    data['device_info_list'] = device_info_list
+                    res.append(data)
+
             # 查询设备数量不为0的其他分组
             device_group_qs = DeviceGroup.objects.filter(~Q(id=device_group_id), user_id=user_id).\
                 values('id', 'group_name')
-            if not device_group_qs.exists():
-                return response.json(0)
-            res = []
-            # 查询各组的设备id和昵称
-            for device_group in device_group_qs:
-                device_info_list = []
-                device_info_qs = Device_Info.objects.filter(device_group_id=device_group['id']).\
-                    values('id', 'NickName')
-                for device_info in device_info_qs:
-                    device_info_list.append(device_info)
+            if device_group_qs.exists():
+                # 查询各组的设备id和昵称
+                for device_group in device_group_qs:
+                    device_info_list = []
+                    device_info_qs = Device_Info.objects.filter(device_group_id=device_group['id']).\
+                        values('id', 'NickName', 'Type')
+                    for device_info in device_info_qs:
+                        device_info_list.append(device_info)
                     device_group['device_info_list'] = device_info_list
                     res.append(device_group)
             return response.json(0, res)