From ec2261e913cc988518681a9aab044a9c9e42a80b Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 27 十二月 2024 10:47:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/utils/excelmerge/conformity.py | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/app/utils/excelmerge/conformity.py b/app/utils/excelmerge/conformity.py
index bca8868..3df2e86 100644
--- a/app/utils/excelmerge/conformity.py
+++ b/app/utils/excelmerge/conformity.py
@@ -1,6 +1,10 @@
-from openpyxl import load_workbook
-from datetime import datetime
import os
+import random
+import shutil
+import string
+from datetime import datetime
+
+from openpyxl import load_workbook
def clear_blank_rows(sheet):
@@ -55,11 +59,25 @@
template_sheets[name].cell(row=i, column=1).value = i - start_row + 1
timestamp = datetime.now().strftime('%Y_%m_%d_%H_%M_%S')
- output_path = os.path.join(print_path, f'{timestamp}.xlsx')
+ random_string = ''.join(random.choice(string.ascii_letters + string.digits) for i in range(5))
+ file_name = f'{random_string}_{timestamp}'
+ output_path = os.path.join(print_path, f'{file_name}.xlsx')
template_excel.save(output_path)
template_excel.close()
- return True
+ # 鍚堝苟瀹屾垚鍚庡垹闄ゆ棤鐢ㄦ枃浠�
+ for filename in os.listdir(file_path):
+ file_path_full = os.path.join(file_path, filename)
+ try:
+ if os.path.isfile(file_path_full) or os.path.islink(file_path_full):
+ os.unlink(file_path_full)
+ elif os.path.isdir(file_path_full):
+ shutil.rmtree(file_path_full)
+ os.rmdir(file_path)
+ except Exception as e:
+ print(f"鍒犻櫎鏂囦欢鏃跺彂鐢熼敊璇�: {e}")
+
+ return file_name
except Exception as e:
print(f"璇诲彇鏁版嵁鍙戠敓閿欒: {e}")
- return False
+ return None
--
Gitblit v1.8.0