|
|
@@ -41,14 +41,14 @@ class UploadUIDFileView(View):
|
|
|
area = request_dict.get('area', None)
|
|
|
isReset = request_dict.get('isReset', 0)
|
|
|
content = request_dict.get('fileName', None)
|
|
|
- # print('content')
|
|
|
- # print(content)
|
|
|
+ print('content')
|
|
|
+ print(content)
|
|
|
|
|
|
content = base64.b64decode(content).decode().strip()
|
|
|
content = content[3:(len(content) - 3)]
|
|
|
uids = content.split('\n')
|
|
|
- # print(uids)
|
|
|
- # print(len(uids))
|
|
|
+ print(uids)
|
|
|
+ print(len(uids))
|
|
|
|
|
|
response = ResponseObject()
|
|
|
|
|
|
@@ -97,7 +97,7 @@ class UploadUIDFileView(View):
|
|
|
# else:
|
|
|
# duplicate.append(key)
|
|
|
# continue
|
|
|
- uidModel = UIDModel(
|
|
|
+ bulk.append(UIDModel(
|
|
|
uid=item.strip(),
|
|
|
uid_extra='',
|
|
|
status=0,
|
|
|
@@ -105,25 +105,7 @@ class UploadUIDFileView(View):
|
|
|
update_time=update_time,
|
|
|
area=area,
|
|
|
mac=mac['value']
|
|
|
- )
|
|
|
- print('uid={uid}, mac={mac}, uid_extra={uid_extra}, status={status}, area={area}'.format(uid=uidModel.uid,
|
|
|
- mac=uidModel.mac,
|
|
|
- uid_extra=uidModel.uid_extra,
|
|
|
- status=uidModel.status,
|
|
|
- area=uidModel.area))
|
|
|
- data = {
|
|
|
- 'uid': item.strip(),
|
|
|
- 'uid_extra': '',
|
|
|
- 'status': 0,
|
|
|
- 'add_time': add_time,
|
|
|
- 'update_time': update_time,
|
|
|
- 'area': area,
|
|
|
- 'mac': mac['value']
|
|
|
- }
|
|
|
- UIDModel.objects.create(**data)
|
|
|
- # tmp = uidModel.save()
|
|
|
- # print(tmp)
|
|
|
- # bulk.append(uidModel)
|
|
|
+ ))
|
|
|
try:
|
|
|
try:
|
|
|
if (count % 5000) == 0:
|
|
|
@@ -136,16 +118,16 @@ class UploadUIDFileView(View):
|
|
|
}
|
|
|
MacModel.objects.filter().update(**data)
|
|
|
except Exception as e:
|
|
|
- print('--------------------------error 5000')
|
|
|
- print(repr(e))
|
|
|
+ # print('--------------------------error 5000')
|
|
|
+ # print(repr(e))
|
|
|
if savePoint:
|
|
|
transaction.rollback(savePoint)
|
|
|
return response.json(174, str(e))
|
|
|
else:
|
|
|
savePoint = None
|
|
|
except Exception as e:
|
|
|
- print('--------------------------error 5001')
|
|
|
- print(repr(e))
|
|
|
+ # print('--------------------------error 5001')
|
|
|
+ # print(repr(e))
|
|
|
return response.json(174, str(e))
|
|
|
count += 1
|
|
|
tmpMac = CommonService.updateMac(mac['value'])
|
|
|
@@ -161,10 +143,10 @@ class UploadUIDFileView(View):
|
|
|
savePoint = transaction.savepoint() # 事务保存点
|
|
|
if len(bulk) > 0:
|
|
|
UIDModel.objects.bulk_create(bulk)
|
|
|
- # bulk.clear()
|
|
|
+ bulk.clear()
|
|
|
except Exception as e:
|
|
|
- print('--------------------------error')
|
|
|
- print(repr(e))
|
|
|
+ # print('--------------------------error')
|
|
|
+ # print(repr(e))
|
|
|
if savePoint:
|
|
|
transaction.rollback(savePoint)
|
|
|
return response.json(174)
|
|
|
@@ -177,14 +159,15 @@ class UploadUIDFileView(View):
|
|
|
}
|
|
|
MacModel.objects.filter().update(**data)
|
|
|
except Exception as e:
|
|
|
- print('--------------------------error 1111')
|
|
|
- print(repr(e))
|
|
|
+ # print('--------------------------error 1111')
|
|
|
+ # print(repr(e))
|
|
|
return response.json(174)
|
|
|
|
|
|
# print('重复：')
|
|
|
# print(duplicate)
|
|
|
|
|
|
operation = self.formatOperation(operation='上传', quantity=int(count), area=int(area))
|
|
|
+ print(operation)
|
|
|
self.add_log(request, operation, token)
|
|
|
|
|
|
if tmpMac is None:
|
|
|
@@ -238,6 +221,7 @@ class UploadUIDFileView(View):
|
|
|
try:
|
|
|
LogModel.objects.create(**log)
|
|
|
except Exception as e:
|
|
|
+ print('出错')
|
|
|
print(repr(e))
|
|
|
|
|
|
def formatOperation(self, operation, quantity, area):
|
|
|
@@ -310,8 +294,8 @@ class DownloadUIDFileView(View):
|
|
|
# print(item)
|
|
|
mac: str = item['uid__mac']
|
|
|
index = mac.rfind(':')
|
|
|
- tmp = mac[0:index] + '\t' + mac[index:]
|
|
|
- content += tmp + '\t'
|
|
|
+ tmp = mac[0:index] + ' ' + mac[index:]
|
|
|
+ content += tmp + ' '
|
|
|
content += item['uid__uid']
|
|
|
content += '\r\n'
|
|
|
updates.append(UIDModel(
|
tanghongbin