From d05dc5c5c1daebfdb4803d7075ff846ad7b3be25 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期一, 30 十二月 2024 17:05:36 +0800
Subject: [PATCH] 使用调度器定时删除文件

---
 app/utils/excelmerge/conformity.py |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/utils/excelmerge/conformity.py b/app/utils/excelmerge/conformity.py
index 3e567d0..aa14775 100644
--- a/app/utils/excelmerge/conformity.py
+++ b/app/utils/excelmerge/conformity.py
@@ -2,12 +2,11 @@
 import random
 import shutil
 import string
-import threading
-import time
 
 from datetime import datetime
 from openpyxl import load_workbook
 from Log import logger
+from main import scheduler
 
 
 def clear_blank_rows(sheet):
@@ -27,17 +26,14 @@
 
 
 def delete_file_after_delay(file_path, delay_minutes):
-    delay_seconds = delay_minutes * 60
-
     def delete_file():
-        time.sleep(delay_seconds)
         try:
             if os.path.exists(file_path):
                 os.remove(file_path)
         except Exception as e:
             logger.error(f"瀹氭椂鍒犻櫎Excel鏂囦欢鏃跺彂鐢熼敊璇�: {e}")
 
-    threading.Thread(target=delete_file).start()
+    scheduler.add_job(delete_file, 'interval', minutes=delay_minutes, id=f"delete_{file_path}")
 
 
 def run_conformity(file_path, print_path):
@@ -82,7 +78,7 @@
         template_excel.save(output_path)
         template_excel.close()
 
-        delete_file_after_delay(output_path, 5)
+        delete_file_after_delay(output_path, 3)
 
         try:
             for filename in os.listdir(file_path):

--
Gitblit v1.8.0