优化序列号信息查询

Controller/TestApi.py

@@ -30,6 +30,7 @@ http://192.168.136.40:8077/Test
 import json
 import time
 import urllib
+import requests
 from Object.AliPayObject import AliPayObject
 import boto3
 from boto3.session import Session
@@ -161,7 +162,7 @@ class testView(View):
             response = ResponseObject('cn')
             return self.serial_repetition_test(request_dict, response)
         if operation == 'getSerialNumberInfo':  # 序列号信息查询
-            return self.getSerialNumberInfo(request_dict, response)
+            return self.getSerialNumberInfo(request_dict, response, requests)
         else:
             return 123
 
@@ -858,22 +859,22 @@ class testView(View):
             return response.json(500, repr(e))
 
     @staticmethod
-    def getSerialNumberInfo(request_dict, response):
+    def getSerialNumberInfo(request_dict, response, requests):
         logger = logging.getLogger('info')
         serial_number = request_dict.get("serialNumber", None)
         if not serial_number:
             return response.json(444)
         serial_number = serial_number[:6]
         try:
-            # url = 'https://www.zositechc.cn/testApi/getSerialNumberInfo'
-            # url = 'http://www.dvema.com/testApi/getSerialNumberInfo'
             data = {}
             company_serial_qs = CompanySerialModel.objects.filter(serial_number=serial_number).values('status')
+            if not company_serial_qs.exists():
+                return response.json(173)
             if company_serial_qs[0]['status'] == 0:
                 return response.json(0, {'contents': '序列号未分配'})
             uid_company_serial_qs = UIDCompanySerialModel.objects.filter(
                 company_serial__serial_number=serial_number).values('uid__uid', 'uid__status',
-                                                                     'company_serial__serial_number')
+                                                                    'company_serial__serial_number')
             if not uid_company_serial_qs.exists() and company_serial_qs[0]['status'] != 0:
                 data['serial_number'] = serial_number
                 if company_serial_qs[0]['status'] == 1:
@@ -901,17 +902,23 @@ class testView(View):
                     'serial_number',
                     'userID_id',
                     'primaryUserID',
-                    'NickName',)
-                if not device_info_qs.exists():
-                    data['uid_binding'] = "设备信息不存在"
-                uid_binding_message = {
-                    'uid': device_info_qs[0]['UID'],
-                    'serialNumber': device_info_qs[0]['serial_number'],
-                    'userID': device_info_qs[0]['userID_id'],
-                    'username': device_info_qs[0]['NickName'],
-                    'primaryUserID': device_info_qs[0]['primaryUserID']
+                    'NickName', )
+                uid_user_message = {
+                    'uid': device_info_qs[0]['UID'] if device_info_qs.exists() else '',
+                    'serialNumber': device_info_qs[0]['serial_number'] if device_info_qs.exists() else '',
+                    'userID': device_info_qs[0]['userID_id'] if device_info_qs.exists() else '',
+                    'username': device_info_qs[0]['NickName'] if device_info_qs.exists() else '',
+                    'primaryUserID': device_info_qs[0]['primaryUserID'] if device_info_qs.exists() else ''
                 }
-                data['uid_binding_message'] = uid_binding_message
+                data['uid_user_message'] = uid_user_message
+            # url = 'http://www.dvema.com/testApi/getSerialNumberInfo'
+            # requests_data = {'serialNumber':serial_number}
+            # res = requests.post(url=url, data=requests_data)
+            # if res.status_code != 200:
+            #     fail_reason = '请求国外服务器序列号信息查询响应状态码异常'
+            #     logger.info('查询异常:{}'.format(fail_reason))
+            #     return response.json(500)
+
             return response.json(0, data)
         except Exception as e:
             logger.info('查询异常:{}'.format(e))