locky преди 3 години
родител
ревизия
4103c6f403
променени са 1 файла, в които са добавени 4 реда и са изтрити 2 реда
  1. 4 2
      Controller/FileController.py

+ 4 - 2
Controller/FileController.py

@@ -301,11 +301,13 @@ class UploadSerialNumberFileView(View):
             content = base64.b64decode(content).decode().strip()
             content = content[3:(len(content)-3)]
             serial_number_list = content.split('\n')
-            serial_number_list = list(map(self.cut_len, serial_number_list))    # 截掉序列号后三
+            serial_number_list = list(map(self.cut_len, serial_number_list))    # 获取序列号前6
             # print('serial_number_list: ', serial_number_list)
 
             # 重置使用状态为已下载(2)的序列号为已分配(1)
             serial_number_qs = SerialNumberModel.objects.filter(serial_number__in=serial_number_list, use_status=2)
+            if not serial_number_qs.exists():
+                return response.json(173)
             count = serial_number_qs.count()    # 需要重置的序列号个数
             if count:
                 with transaction.atomic():
@@ -324,7 +326,7 @@ class UploadSerialNumberFileView(View):
             return response.json(500, repr(e))
 
     def cut_len(self, serial_number):
-        serial_number = serial_number[:-3]
+        serial_number = serial_number[:6]
         return serial_number
 
     def add_log(self, request, operation, token):