From c273539ea3b191ee680921ef5d09477a770cd644 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期一, 30 十二月 2024 17:45:13 +0800
Subject: [PATCH] 避免循环导入
---
app/utils/excelmerge/conformity.py | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/app/utils/excelmerge/conformity.py b/app/utils/excelmerge/conformity.py
index 3df2e86..ccaf871 100644
--- a/app/utils/excelmerge/conformity.py
+++ b/app/utils/excelmerge/conformity.py
@@ -2,9 +2,10 @@
import random
import shutil
import string
-from datetime import datetime
+from datetime import datetime
from openpyxl import load_workbook
+from Log import logger
def clear_blank_rows(sheet):
@@ -21,6 +22,19 @@
source_sheet.cell(row=row, column=col).value for col in range(4, source_sheet.max_column + 1)):
target_sheet.append(
[source_sheet.cell(row=row, column=col).value for col in range(1, source_sheet.max_column + 1)])
+
+
+def delete_file_after_delay(file_path, delay_minutes):
+ from main import scheduler
+
+ def delete_file():
+ try:
+ if os.path.exists(file_path):
+ os.remove(file_path)
+ except Exception as e:
+ logger.error(f"瀹氭椂鍒犻櫎Excel鏂囦欢鏃跺彂鐢熼敊璇�: {e}")
+
+ scheduler.add_job(delete_file, 'interval', minutes=delay_minutes, id=f"delete_{file_path}")
def run_conformity(file_path, print_path):
@@ -65,17 +79,18 @@
template_excel.save(output_path)
template_excel.close()
- # 鍚堝苟瀹屾垚鍚庡垹闄ゆ棤鐢ㄦ枃浠�
- for filename in os.listdir(file_path):
- file_path_full = os.path.join(file_path, filename)
- try:
+ delete_file_after_delay(output_path, 3)
+
+ try:
+ for filename in os.listdir(file_path):
+ file_path_full = os.path.join(file_path, filename)
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}")
+ os.rmdir(file_path)
+ except Exception as e:
+ print(f"鍒犻櫎鏂囦欢鏃跺彂鐢熼敊璇�: {e}")
return file_name
except Exception as e:
--
Gitblit v1.8.0