From 93501af060bf8656c308ccf6319cf41cd5687c05 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期一, 30 十二月 2024 11:08:40 +0800
Subject: [PATCH] 定时删除没有被下载的excel文件

---
 app/utils/excelmerge/conformity.py |   34 ++++++++++++++++++++++++++--------
 1 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/app/utils/excelmerge/conformity.py b/app/utils/excelmerge/conformity.py
index 3df2e86..3e567d0 100644
--- a/app/utils/excelmerge/conformity.py
+++ b/app/utils/excelmerge/conformity.py
@@ -2,9 +2,12 @@
 import random
 import shutil
 import string
-from datetime import datetime
+import threading
+import time
 
+from datetime import datetime
 from openpyxl import load_workbook
+from Log import logger
 
 
 def clear_blank_rows(sheet):
@@ -21,6 +24,20 @@
                 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):
+    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()
 
 
 def run_conformity(file_path, print_path):
@@ -65,17 +82,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, 5)
+
+        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