Просмотр исходного кода

生成接口和分配接口对应相应包装函数(generateFail和failResponse)

guanhailong 2 лет назад
Родитель
Сommit
d09ccda7d1
1 измененных файлов с 19 добавлено и 14 удалено
  1. 19 14
      Controller/SerialNumberController.py

+ 19 - 14
Controller/SerialNumberController.py

@@ -10,7 +10,7 @@ from django.db import transaction
 from django.db.models import Count
 from django.views import View
 
-from Model.models import SerialNumberModel, UserModel, UserSerialNumberModel, UserUIDModel, CompanySerialModel, \
+from Model.models import SerialNumberModel, UserModel, UserSerialNumberModel, CompanySerialModel, \
     MacModel, LogModel, CompanyModel
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
@@ -46,7 +46,7 @@ class SerialNumberView(View):
             return response.json(token.code)
 
         if operation == 'quantity':  # 查询当前可用的UID的数量
-            return self.do_quantity(request_dict, token.userID, response)
+            return self.do_quantity(token.userID, response)
         elif operation == 'allot':
             return self.do_allot(request_dict, response)
         elif operation == 'createSerial':  # 生成序列号
@@ -75,7 +75,7 @@ class SerialNumberView(View):
         serial_list = [item[key] for item in serial_number_qs for key in item]
         try:
             country_serial_qs = CompanySerialModel.objects.filter(serial_number__in=serial_list).values('status')
-            country_serial_qs.filter(status=status).update(status=1)
+            country_serial_qs.filter(status=status).update(status=2)
             return response.json(0)
         except Exception as e:
             print(e)
@@ -183,11 +183,11 @@ class SerialNumberView(View):
                 # res4 = requests.post(url=url4, data=requests_data, timeout=2 * 60)
                 # if res4.status_code != 200:
                 #     fail_reason = '请求欧洲服务器生成Company Serial响应状态码异常'
-                #     return self.failResponse(company.name, quantity, fail_reason, Log, response)
+                #     return self.failResponse1(company.name, quantity, fail_reason, Log, response)
                 # res4 = res4.json()
                 # if res4['code'] != 0:
                 #     fail_reason = '欧洲服务器生成Company Serial发生异常'
-                #     return self.failResponse(company.name, quantity, fail_reason, Log, response)
+                #     return self.failResponse1(company.name, quantity, fail_reason, Log, response)
 
                 return response.json(0)
 
@@ -196,6 +196,12 @@ class SerialNumberView(View):
             djangoLogger.exception(repr(e))
             return response.json(176)
 
+    def failResponse(self, company_name, quantity, fail_reason, Log, response):
+        operation = '{}生成{}个Company Serial{}: {}'.format(company_name, quantity, '失败', fail_reason)
+        Log.operation = operation
+        Log.save()
+        return response.json(177)
+
     def create_serial(self, request_dict, response, request):
         """
         生成序列号
@@ -252,29 +258,29 @@ class SerialNumberView(View):
                 res1 = requests.post(url=url1, data=requests_data, timeout=2 * 60)
                 if res1.status_code != 200:
                     fail_reason = '请求测试服务器生成Serial Number响应状态码异常'
-                    return self.failResponse(quantity, fail_reason, Log, response)
+                    return self.generateFail(quantity, fail_reason, Log, response)
                 res1 = res1.json()
                 if res1['result_code'] != 0:
                     fail_reason = '测试服务器生成Serial Number发生异常'
-                    return self.failResponse(quantity, fail_reason, Log, response)
+                    return self.generateFail(quantity, fail_reason, Log, response)
 
                 res2 = requests.post(url=url2, data=requests_data, timeout=2 * 60)
                 if res2.status_code != 200:
                     fail_reason = '请求国内服务器生成Serial Number响应状态码异常'
-                    return self.failResponse(quantity, fail_reason, Log, response)
+                    return self.generateFail(quantity, fail_reason, Log, response)
                 res2 = res2.json()
                 if res2['result_code'] != 0:
                     fail_reason = '国内服务器生成Serial Number发生异常'
-                    return self.failResponse(quantity, fail_reason, Log, response)
+                    return self.generateFail(quantity, fail_reason, Log, response)
 
                 res3 = requests.post(url=url3, data=requests_data, timeout=2 * 60)
                 if res3.status_code != 200:
                     fail_reason = '请求美国服务器生成Serial Number响应状态码异常'
-                    return self.failResponse(quantity, fail_reason, Log, response)
+                    return self.generateFail(quantity, fail_reason, Log, response)
                 res3 = res3.json()
                 if res3['result_code'] != 0:
                     fail_reason = '美国服务器生成Serial Number发生异常'
-                    return self.failResponse(quantity, fail_reason, Log, response)
+                    return self.generateFail(quantity, fail_reason, Log, response)
                 # res4 = requests.post(url=url4, data=requests_data, timeout=2 * 60)
                 # if res4.status_code != 200:
                 #     fail_reason = '请求欧洲服务器生成Company Serial响应状态码异常'
@@ -290,16 +296,15 @@ class SerialNumberView(View):
             djangoLogger.exception(repr(e))
             return response.json(176)
 
-    def failResponse(self, quantity, fail_reason, Log, response):
+    def generateFail(self, quantity, fail_reason, Log, response):
         operation = '生成{}个Serial Number{}: {}'.format(quantity, '失败', fail_reason)
         Log.operation = operation
         Log.save()
         return response.json(177)
 
-    def do_quantity(self, request_dict, userID, response):
+    def do_quantity(self, userID, response):
         """
         查询当前可用的UID的数量
-        :param request_dict: 请求参数
         :param userID: 响应对象
         :param response: 请求
         :return: