From 4faa732b1bd55335b142d5454833a8d5432675fe Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期四, 26 十二月 2024 18:08:42 +0800
Subject: [PATCH] resources_type表同步
---
app/api/excel.py | 85 +++++++++++++-----------------------------
1 files changed, 27 insertions(+), 58 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index f581508..7b8e792 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -1,6 +1,9 @@
-from fastapi import APIRouter, File, UploadFile, Form, BackgroundTasks
+from fastapi import APIRouter, File, UploadFile, Form, BackgroundTasks, Depends
from fastapi.responses import JSONResponse, FileResponse
from starlette.websockets import WebSocket
+
+from app.api import get_current_user, get_current_user_websocket
+from app.models import UserModel
from app.utils.excelmerge.conformity import run_conformity
import shutil
import os
@@ -39,18 +42,18 @@
@router.post('/excel/upload')
-async def upload_file(files: list[UploadFile] = File(...), user_id: str = Form(...)):
+async def upload_file(files: list[UploadFile] = File(...), current_user: UserModel = Depends(get_current_user)):
+ user_id = str(current_user.id)
if not any(file.filename for file in files):
return JSONResponse(content={"error": "娌℃湁鏂囦欢閮ㄥ垎"}, status_code=400)
if not user_id:
return JSONResponse(content={"error": "缂哄皯鍙傛暟user_id"}, status_code=400)
user_source = user_file_path(user_id, SOURCE_FILES_PATH)
- user_excel = user_file_path(user_id, EXCEL_FILES_PATH)
+ user_excel = EXCEL_FILES_PATH
create_dir_if_not_exists(user_source)
create_dir_if_not_exists(user_excel)
clear_directory(user_source)
- clear_directory(user_excel)
save_path_list = []
for file in files:
@@ -67,12 +70,13 @@
# ws://localhost:9201/api/document/ws/excel
-@router.websocket("/ws/excel/{user_id}")
-async def ws_excel(websocket: WebSocket, user_id: str):
+@router.websocket("/ws/excel")
+async def ws_excel(websocket: WebSocket, current_user: UserModel = Depends(get_current_user_websocket)):
await websocket.accept()
+ user_id = str(current_user.id)
user_source = user_file_path(user_id, SOURCE_FILES_PATH)
- user_excel = user_file_path(user_id, EXCEL_FILES_PATH)
+ user_excel = EXCEL_FILES_PATH
create_dir_if_not_exists(user_source)
create_dir_if_not_exists(user_excel)
@@ -80,19 +84,14 @@
data = await websocket.receive_text()
try:
if data == "\"鍚堝苟Excel\"":
- run_excel = run_conformity(user_source, user_excel)
- files = os.listdir(user_excel)
- if run_excel:
- first_file = files[0]
- file_name = os.path.basename(first_file)
- download_url = f"./api/document/download/{first_file}"
+ merge_file = run_conformity(user_source, user_excel)
+ if merge_file is not None:
+
await websocket.send_json({
"message": "鏂囨。鍚堝苟鎴愬姛锛�",
"type": "stream",
- "files": [{
- "file_name": file_name,
- "file_url": download_url
- }]
+ "file_name": f"{merge_file}.xlsx",
+ "download_url": f"./api/document/download/{merge_file}.xlsx"
})
await websocket.send_json({
"message": "鏂囨。鍚堝苟鎴愬姛锛�",
@@ -100,28 +99,6 @@
})
else:
await websocket.send_json({"error": "鍚堝苟澶辫触", "type": "stream", "files": []})
- elif data == "\"鏌ヨ鍚堝苟杩涘害\"":
- files = os.listdir(user_excel)
- if not files:
- await websocket.send_json({"step_message": "姝ｅ湪鍚堝苟涓�", "type": "stream", "files": []})
- else:
- await websocket.send_json({"step_message": "鏂囨。鍚堝苟鎴愬姛锛�", "type": "stream", "files": []})
- elif data == "\"鑾峰彇鏂囦欢\"":
- files = os.listdir(user_excel)
- if not files:
- await websocket.send_json({"error": "鐩綍涓嬫病鏈夌敓鎴愮殑鏂囦欢", "type": "stream", "files": []})
- else:
- first_file = files[0]
- file_name = os.path.basename(first_file)
- file_url = f"./api/document/download/{first_file}"
- await websocket.send_json({
- "step_message": "鏂囨。鍚堝苟鎴愬姛锛�",
- "type": "stream",
- "files": [{
- "file_name": file_name,
- "file_url": file_url
- }]
- })
else:
print(f"Received data: {data}")
await websocket.send_json({"error": "鏈煡鎸囦护", "data": str(data)})
@@ -130,30 +107,22 @@
await websocket.close()
-@router.get("/download/{filename}")
-async def download_file(filename: str, user_id: str, background_tasks: BackgroundTasks):
- 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)
+@router.get("/download/{file_full_name}")
+async def download_file(background_tasks: BackgroundTasks, file_full_name: str):
+ file_name = os.path.basename(file_full_name)
+ user_excel = EXCEL_FILES_PATH
+ file_path = os.path.join(user_excel, file_full_name)
if not os.path.exists(file_path):
- return JSONResponse(status_code=404, content={"error": "鏂囦欢涓嶅瓨鍦�"})
-
- def delete_files_in_directory(directory):
- for root, dirs, files in os.walk(directory, topdown=False):
- for name in files:
- os.remove(os.path.join(root, name))
- for name in dirs:
- os.rmdir(os.path.join(root, name))
+ return JSONResponse(content={"error": "鏂囦欢涓嶅瓨鍦�"}, status_code=404)
def delete_file():
try:
- delete_files_in_directory(user_excel)
- delete_files_in_directory(user_source)
+ os.unlink(file_path)
except OSError as e:
- print(f"Error deleting file {file_path}: {e}")
+ print(f"Deleting file error")
+ # 寰呬笅杞藉畬鎴愬悗鍒犻櫎鐢熸垚鐨勬枃浠�
background_tasks.add_task(delete_file)
-
- return FileResponse(file_path, filename=filename,
- media_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
+ return FileResponse(path=file_path, filename=file_name,
+ media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
--
Gitblit v1.8.0