设备信息增加设备类型筛选,用户信息增加国家筛选

AdminController/DeviceManagementController.py

@@ -110,6 +110,7 @@ class DeviceManagement(View):
         NickName = request_dict.get('NickName', None)
         username = request_dict.get('username', None)
         version = request_dict.get('version', None)
+        Type = request_dict.get('Type', None)
 
         if not all([pageNo, pageSize]):
             return response.json(444)
@@ -118,7 +119,7 @@ class DeviceManagement(View):
         line = int(pageSize)
 
         try:
-            if any([UID, serialNumber, NickName, username, version]):  # 条件查询
+            if any([UID, serialNumber, NickName, username, version, Type]):  # 条件查询
                 if UID:
                     device_info_qs = Device_Info.objects.filter(UID__icontains=UID)
                 if serialNumber:
@@ -132,6 +133,10 @@ class DeviceManagement(View):
                 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)
+                if Type:
+                    type_list = DeviceTypeModel.objects.filter(name=Type).values_list('type', flat=True)
+                    device_info_qs = Device_Info.objects.filter(Type__in=type_list)
+
                 total = device_info_qs.count()
                 if not total:
                     return response.json(0, {'list': {}, 'total': 0})

AdminController/UserManageController.py

@@ -337,6 +337,7 @@ class UserManagement(View):
         NickName = request_dict.get('NickName', '').strip()
         phone = request_dict.get('phone', '').strip()
         userEmail = request_dict.get('userEmail', '').strip()
+        countryName = request_dict.get('countryName', '').strip()
         pageNo = request_dict.get('pageNo', None)
         pageSize = request_dict.get('pageSize', None)
 
@@ -346,7 +347,7 @@ class UserManagement(View):
         page = int(pageNo)
         line = int(pageSize)
         try:
-            if username or NickName or phone or userEmail:
+            if username or NickName or phone or userEmail or countryName:
                 # 条件查询
                 if username:
                     device_user_qs = Device_User.objects.filter(username__icontains=username)
@@ -356,6 +357,9 @@ class UserManagement(View):
                     device_user_qs = Device_User.objects.filter(phone__icontains=phone)
                 if userEmail:
                     device_user_qs = Device_User.objects.filter(userEmail__icontains=userEmail)
+                if countryName:
+                    id_list = CountryModel.objects.filter(country_name=countryName).values_list('id', flat=True)
+                    device_user_qs = Device_User.objects.filter(region_country__in=id_list)
                 if not device_user_qs.exists():
                     return response.json(0)
                 total = len(device_user_qs)