From b40851d4f1d321782c17af6ed8f062113bf0ed31 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期四, 26 十二月 2024 16:38:26 +0800
Subject: [PATCH] 合并excel上传，合并，下载 修改
---
app/utils/excelmerge/conformity.py | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/app/utils/excelmerge/conformity.py b/app/utils/excelmerge/conformity.py
index 6a609b3..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):
@@ -19,20 +23,16 @@
[source_sheet.cell(row=row, column=col).value for col in range(1, source_sheet.max_column + 1)])
-def run_conformity():
+def run_conformity(file_path, print_path):
try:
# 鍔犺浇妯℃澘鏂囦欢
template_path = os.path.join('app', 'utils', 'excelmerge', '鍥界綉涓婃捣鐢靛姏鏁村悎妯＄増.xlsx')
template_excel = load_workbook(template_path)
- EXCEL_FILES_PATH = os.path.join('data', 'output')
-
template_sheets = {sheet.title: sheet for sheet in template_excel}
-
- source_folder = os.path.join('data', 'source')
- source_files = [f for f in os.listdir(source_folder) if f.endswith('.xlsx') and not f.startswith('~$')]
+ source_files = [f for f in os.listdir(file_path) if f.endswith('.xlsx') and not f.startswith('~$')]
for file in source_files:
- source_path = os.path.join(source_folder, file)
+ source_path = os.path.join(file_path, file)
source_excel = load_workbook(source_path)
# 鍔ㄦ�佽幏鍙栧伐浣滆〃
@@ -59,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(EXCEL_FILES_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