V3查询设备列表接口优化

Controller/EquipmentManagerV3.py

@@ -605,10 +605,14 @@ class EquipmentManagerV3(View):
         dvqs = Device_Info.objects.filter(userID_id=userID)
         # # 过滤已重置的设备
         dvqs = dvqs.filter(~Q(isExist=2))
+        if NickName:
+            dvqs.filter(NickName=NickName)
+        if uid:
+            dvqs.filter(UID=uid)
         dvql = dvqs.values('id', 'userID', 'NickName', 'UID', 'View_Account', 'View_Password', 'ChannelIndex',
                            'Type', 'isShare', 'primaryUserID', 'primaryMaster', 'data_joined', 'vodPrimaryUserID',
                            'vodPrimaryMaster', 'userID__userEmail', 'version', 'isVod', 'isExist', 'NotificationMode',
-                           'isCameraOpenCloud', 'serial_number')
+                           'isCameraOpenCloud', 'serial_number')[(page - 1) * line:page * line]
         dvls = CommonService.qs_to_list(dvql)
         uid_list = []
         for dvl in dvls:
@@ -776,40 +780,10 @@ class EquipmentManagerV3(View):
                 # 设备版本号
                 p['uid_version'] = ''
                 p['ucode'] = ''
+            p['View_Password'] = self.encrypt_pwd(p['View_Password'])
             data.append(p)
         result = data
-
-        if NickName:
-            # print('NickName搜索缓存')
-            data = []
-            for index, item in enumerate(result):
-                if NickName == item['NickName']:
-                    # 加密
-                    item['View_Password'] = self.encrypt_pwd(item['View_Password'])
-                    data.append(item)
-                    return response.json(0, data)
-        if uid:
-            # print('uid搜索缓存')
-            data = []
-            for index, item in enumerate(result):
-                if uid != item['UID']:
-                    continue
-                else:
-                    item['View_Password'] = self.encrypt_pwd(item['View_Password'])  # 加密
-                    data.append(item)
-                    return response.json(0, data)
-                return response.json(0, data)
-        items = []
-        # print('缓存分页')
-        for index, item in enumerate(result):
-            if (page - 1) * line <= index:
-                if index < page * line:
-                    # 加密
-                    item['View_Password'] = self.encrypt_pwd(item['View_Password'])
-                    print(item)
-                    items.append(item)
-        print(items)
-        return response.json(0, items)
+        return response.json(0, result)
 
     def do_fuzzy_query(self, userID, request_dict, response):
         fuzzy = request_dict.get('fuzzy', None)