查询设备版本

AdminController/DeviceManagementController.py

@@ -179,6 +179,7 @@ class DeviceManagement(View):
         serialNumber = request_dict.get('serialNumber', None)
         NickName = request_dict.get('NickName', None)
         username = request_dict.get('username', None)
+        version = request_dict.get('version', None)
 
         if not all([pageNo, pageSize]):
             return response.json(444)
@@ -187,7 +188,7 @@ class DeviceManagement(View):
         line = int(pageSize)
 
         try:
-            if UID or serialNumber or NickName or username:  # 条件查询
+            if any([UID, serialNumber, NickName, username, version]):  # 条件查询
                 if UID:
                     device_info_qs = Device_Info.objects.filter(UID__icontains=UID)
                 if serialNumber:
@@ -198,6 +199,9 @@ class DeviceManagement(View):
                     device_info_qs = Device_Info.objects.filter(Q(userID__username__icontains=username) |
                                                                 Q(userID__userEmail__icontains=username) |
                                                                 Q(userID__phone__icontains=username))
+                if version:
+                    uid_list = UidSetModel.objects.filter(version__icontains=version).values_list('uid', flat=True)
+                    device_info_qs = Device_Info.objects.filter(UID__in=uid_list)
                 total = device_info_qs.count()
                 if not total:
                     return response.json(0, {'list': {}, 'total': 0})