设备获取域名查询数据去掉模糊查询

Controller/SerialNumberController.py

@@ -7,7 +7,7 @@ import requests
 from django.db import transaction
 from django.views import View
 
-from Ansjer.config import CRCKey, CONFIG_INFO, CONFIG_TEST, CONFIG_US, \
+from Ansjer.config import CRCKey, CONFIG_INFO, CONFIG_US, \
     CONFIG_CN, USED_SERIAL_REDIS_LIST, UNUSED_SERIAL_REDIS_LIST, SERVER_DOMAIN_US, REGION_ID_LIST, SERVER_DOMAIN_TEST, \
     SERVER_DOMAIN_LIST, SERVER_DOMAIN_CN, SERVER_DOMAIN_EUR, RESET_REGION_ID_SERIAL_REDIS_LIST
 from Model.models import SerialNumberModel, CompanySerialModel, UIDCompanySerialModel, UIDModel, Device_Info, \
@@ -321,24 +321,23 @@ class SerialNumberView(View):
         @param redis_obj: redis对象
         @return:
         """
-        # 测试服不处理
-        if CONFIG_INFO != CONFIG_TEST:
-            redis_obj.rpush(USED_SERIAL_REDIS_LIST, serial)
-
-            vpg_id = 1
-            if CONFIG_INFO == 'us':
-                vpg_id = 3
-            elif CONFIG_INFO == 'eur':
-                vpg_id = 4
-            p2p_type = int(p2p_type)
-
-            # 剩余uid数量少于2000邮件提醒
-            unused_uid_count = UIDModel.objects.filter(vpg_id=vpg_id, p2p_type=p2p_type, status=0).count()
-            warning_count = 2000
-            if unused_uid_count < warning_count:
-                platform = '尚云' if p2p_type == 1 else 'tutk'
-                email_content = '{}服{]的uid数量少于{}个,请及时处理'.format(CONFIG_INFO, platform, warning_count)
-                S3Email().faEmail(email_content, 'servers@ansjer.com')
+        # 写入已使用序列号redis列表
+        redis_obj.rpush(USED_SERIAL_REDIS_LIST, serial)
+
+        vpg_id = 1
+        if CONFIG_INFO == 'us':
+            vpg_id = 3
+        elif CONFIG_INFO == 'eur':
+            vpg_id = 4
+        p2p_type = int(p2p_type)
+
+        # 剩余uid数量少于2000邮件提醒
+        unused_uid_count = UIDModel.objects.filter(vpg_id=vpg_id, p2p_type=p2p_type, status=0).count()
+        warning_count = 2000
+        if unused_uid_count < warning_count:
+            platform = '尚云' if p2p_type == 1 else 'tutk'
+            email_content = '{}服{]的uid数量少于{}个,请及时处理'.format(CONFIG_INFO, platform, warning_count)
+            S3Email().faEmail(email_content, 'servers@ansjer.com')
 
     @staticmethod
     def log_and_send_email(request, company_serial_id, serial, now_time):
@@ -351,12 +350,12 @@ class SerialNumberView(View):
         """
         send_email = S3Email()
         try:
-            if CONFIG_INFO == 'cn':
+            if CONFIG_INFO != 'us':
                 return {}
             # 判断当前序列号是否绑定UID
             uid_serial_qs = UIDCompanySerialModel.objects.filter(company_serial_id=company_serial_id)
             if uid_serial_qs.exists():
-                email_content = '序列号已占用当前数据库已绑定UID: {}'.format(serial)
+                email_content = '{}序列号已占用当前数据库已绑定UID: {}'.format(CONFIG_INFO, serial)
                 send_email.faEmail(email_content, 'servers@ansjer.com')
                 send_email.faEmail(email_content, 'antony@ansjer.com')
                 return {}
@@ -364,7 +363,7 @@ class SerialNumberView(View):
             response = requests.post("https://www.zositechc.cn/serialNumber/get-status",
                                      data={'serial_number': serial}, timeout=3)
             ip = CommonService.get_ip_address(request)
-            operation = '序列号占用:{}'.format(serial)
+            operation = '{}序列号占用:{}'.format(CONFIG_INFO, serial)
             log = {
                 'ip': ip,
                 'user_id': 1,
@@ -406,7 +405,7 @@ class SerialNumberView(View):
                     # 成功后 修改企业序列号状态为2（已分配）
                     CompanySerialModel.objects.filter(id=company_serial_id) \
                         .update(status=2, update_time=now_time)
-                    email_content = '序列号已占用已将国内UID数据同步完成: {}'.format(serial)
+                    email_content = '{}序列号已占用已将国内UID数据同步完成: {}'.format(CONFIG_INFO, serial)
                     send_email.faEmail(email_content, 'servers@ansjer.com')
                     send_email.faEmail(email_content, 'antony@ansjer.com')
                     operation += '同步成功'
@@ -515,9 +514,8 @@ class SerialNumberView(View):
                 ExperienceAiModel.objects.filter(uid=uid).delete()
                 AiService.objects.filter(uid=uid).delete()
 
-                # 不为测试服,则写入redis列表
-                if CONFIG_INFO != CONFIG_TEST:
-                    redisObj.rpush(UNUSED_SERIAL_REDIS_LIST, serial)
+                # 写入未使用序列号redis列表
+                redisObj.rpush(UNUSED_SERIAL_REDIS_LIST, serial)
 
                 # 重置region_id,不为美洲服,则写入redis列表
                 if CONFIG_INFO == CONFIG_US:
@@ -727,7 +725,7 @@ class SerialNumberView(View):
         try:
             serial_number = serial_number[:6]
 
-            device_domain_region_qs = DeviceDomainRegionModel.objects.filter(serial_number__contains=serial_number).values(
+            device_domain_region_qs = DeviceDomainRegionModel.objects.filter(serial_number=serial_number).values(
                 'region_id')
             if not device_domain_region_qs.exists():
                 return response.json(173)