zhangdongming 2 жил өмнө
parent
commit
f374feddda
1 өөрчлөгдсөн 4 нэмэгдсэн , 12 устгасан
  1. 4 12
      Controller/TestApi.py

+ 4 - 12
Controller/TestApi.py

@@ -19,6 +19,7 @@ import cv2
 from botocore import client
 from django.db import transaction
 
+from Ansjer.cn_config.config_formal import CONFIG_INFO
 from Ansjer.config import CONFIG_INFO
 from Controller.DeviceConfirmRegion import Device_Region
 from Object.AWS.AmazonS3Util import AmazonS3Util
@@ -162,7 +163,7 @@ class testView(View):
         elif operation == 'serial-repetition':  # 用与测试序列号重复接口
             response = ResponseObject('cn')
             return self.serial_repetition_test(request_dict, response)
-        elif operation == 'getSerialNumberInfo':  # 序列号查重
+        elif operation == 'getSerialNumberInfo':  # 序列号信息查询
             return self.getSerialNumberInfo(request_dict, response)
         elif operation == 'get-serial-details':  # 序列号信息查询
             return self.get_serial_details(request_dict, response, request)
@@ -171,12 +172,8 @@ class testView(View):
 
     @classmethod
     def serial_repetition_test(cls, request_dict, response):
-        """
-        专用于生产扫码排查序列号重复,辅助接口
-        """
         try:
             serial_no = request_dict.get('serialNo', None)
-            phone_model = request_dict.get('phoneModel', None)
             if not serial_no:
                 return response.json(444)
             with transaction.atomic():
@@ -187,16 +184,11 @@ class testView(View):
                 serial_qs = TestSerialRepetition.objects.filter(serial_number=serial_no)
                 if not serial_qs.exists():
                     n_time = int(time.time())
-                    params = {'serial_number': serial_no,
-                              'created_time': n_time,
-                              'phone_model': phone_model}
+                    params = {'serial_number': serial_no, 'created_time': n_time}
                     TestSerialRepetition.objects.create(**params)
                     return response.json(0)
                 else:
-                    result = {'serialNumber': serial_qs.first().serial_number,
-                              'phoneModel': serial_qs.first().phone_model,
-                              'createdTime': serial_qs.first().created_time}
-                    return response.json(174, result)
+                    return response.json(174)
         except Exception as e:
             logging.info('异常错误,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
             return response.json(178, e)