设备模糊搜索

Controller/EquipmentManagerV3.py

@@ -558,17 +558,29 @@ class EquipmentManagerV3(View):
         if page and line:
             page = int(page)
             line = int(line)
-            device_qs = Device_Info.objects.filter(userID=userID)
-            device_qs = device_qs.filter(~Q(isExist=2))
-            if device_qs.exists():
+            device_qs_list = Device_Info.objects.filter(userID=userID)
+            device_qs_list = device_qs_list.filter(~Q(isExist=2))
+            if device_qs_list.exists():
                 if fuzzy:
-                    device_qs = device_qs.filter(Q(UID__contains=fuzzy) | Q(NickName__contains=fuzzy))
-
-                device_qs = device_qs.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')
+                    device_qs = device_qs_list.filter(Q(UID__contains=fuzzy) | Q(NickName__contains=fuzzy))
+                    if not device_qs.exists():
+                        fuzzy2 = fuzzy.swapcase()
+                        device_qs = device_qs_list.filter(Q(UID__contains=fuzzy2) | Q(NickName__contains=fuzzy2))
+                    device_qs = device_qs.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')
+                else:
+                    device_qs = device_qs_list.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')
 
                 dvls = CommonService.qs_to_list(device_qs)
                 uid_list = []

CrontabTask/test_statistics_push_day_task.py

@@ -1,10 +1,14 @@
 import json
 
 import requests
+from Ansjer.config import SERVER_TYPE
 
+base_url = ''
+if SERVER_TYPE == "Ansjer.us_config.test_settings":
+    base_url = 'http://test.dvema.com/'
+elif SERVER_TYPE == "Ansjer.cn_config.test_settings":
+    base_url = 'http://http://test.zositechc.cn/'
 
-# url = 'http://test.dvema.com'
-base_url = 'http://test.dvema.com/'
 username='13800138001'
 password='ansjer999999'
 login_url = base_url + 'account/login'

CrontabTask/test_statistics_push_month_task.py

@@ -1,10 +1,14 @@
 import json
 
 import requests
+from Ansjer.config import SERVER_TYPE
 
+base_url = ''
+if SERVER_TYPE == "Ansjer.us_config.test_settings":
+    base_url = 'http://test.dvema.com/'
+elif SERVER_TYPE == "Ansjer.cn_config.test_settings":
+    base_url = 'http://http://test.zositechc.cn/'
 
-# url = 'http://test.dvema.com'
-base_url = 'http://test.dvema.com/'
 username='13800138001'
 password='ansjer999999'
 login_url = base_url + 'account/login'

CrontabTask/test_zositech_help_weekly_task.py

@@ -2,11 +2,15 @@ import json
 
 import requests
 import time
+from Ansjer.config import SERVER_TYPE
 
+base_url = ''
+if SERVER_TYPE == "Ansjer.us_config.test_settings":
+    base_url = 'http://test.dvema.com/'
+elif SERVER_TYPE == "Ansjer.cn_config.test_settings":
+    base_url = 'http://http://test.zositechc.cn/'
 
-# url = 'http://test.dvema.com'
 # base_url = 'http://127.0.0.1:8000/'
-base_url = 'http://test.dvema.com/'
 username='13800138001'
 password='ansjer999999'
 login_url = base_url + 'account/login'