From cf49206eb33343a607d7b842fcf62906f2d5b46e Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期四, 26 十二月 2024 13:42:59 +0800
Subject: [PATCH] 合并excel下载方式修改
---
app/api/excel.py | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index 0622cb0..9c13103 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -135,16 +135,22 @@
await websocket.close()
-@router.get("/download/{filename}")
-async def download_file(filename: str, background_tasks: BackgroundTasks,
- current_user: UserModel = Depends(get_current_user)):
+@router.get("/download/excel")
+async def download_file(background_tasks: BackgroundTasks, current_user: UserModel = Depends(get_current_user)):
user_id = str(current_user.id)
user_excel = user_file_path(user_id, EXCEL_FILES_PATH)
user_source = user_file_path(user_id, SOURCE_FILES_PATH)
- file_path = os.path.join(user_excel, filename)
- if not os.path.exists(file_path):
- return JSONResponse(status_code=404, content={"error": "鏂囦欢涓嶅瓨鍦�"})
+ if not os.path.exists(user_excel):
+ return JSONResponse(status_code=404, content={"error": "鐢ㄦ埛鐩綍涓嶅瓨鍦�"})
+
+ excel_files = [f for f in os.listdir(user_excel) if os.path.isfile(os.path.join(user_excel, f))]
+ excel_files.sort(key=lambda x: os.path.getmtime(os.path.join(user_excel, x)), reverse=True)
+ if not excel_files:
+ return JSONResponse(status_code=404, content={"error": "鐢ㄦ埛鐩綍鍐呮病鏈夋枃浠�"})
+
+ filename = excel_files[0]
+ file_path = os.path.join(user_excel, filename)
def delete_files_in_directory(directory):
for root, dirs, files in os.walk(directory, topdown=False):
--
Gitblit v1.8.0