From b2a5cf3f47b86ec6b69053dfb2a12d02e3980720 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 31 十二月 2024 14:42:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway

---
 app/utils/excelmerge/conformity.py |   19 -------------------
 1 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/app/utils/excelmerge/conformity.py b/app/utils/excelmerge/conformity.py
index 3e567d0..fed5e19 100644
--- a/app/utils/excelmerge/conformity.py
+++ b/app/utils/excelmerge/conformity.py
@@ -2,12 +2,9 @@
 import random
 import shutil
 import string
-import threading
-import time
 
 from datetime import datetime
 from openpyxl import load_workbook
-from Log import logger
 
 
 def clear_blank_rows(sheet):
@@ -24,20 +21,6 @@
                 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):
@@ -81,8 +64,6 @@
         output_path = os.path.join(print_path, f'{file_name}.xlsx')
         template_excel.save(output_path)
         template_excel.close()
-
-        delete_file_after_delay(output_path, 5)
 
         try:
             for filename in os.listdir(file_path):

--
Gitblit v1.8.0