From 2d0c7b15898e16ab4bdc22bd95c23b13e3455c0a Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期三, 25 十二月 2024 14:24:12 +0800
Subject: [PATCH] 合并webSocket修改
---
app/api/excel.py | 128 +++++++++++++++++++++++++++---------------
1 files changed, 81 insertions(+), 47 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index 4110527..5f35b5a 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -1,13 +1,6 @@
-from fastapi import APIRouter, File, UploadFile, Depends
+from fastapi import APIRouter, File, UploadFile, Form
from fastapi.responses import JSONResponse, FileResponse
-from fastapi.exceptions import HTTPException
-from sqlalchemy.orm import Session
-from starlette.websockets import WebSocket, WebSocketDisconnect
-from werkzeug.utils import secure_filename
-from app.api import get_current_user_websocket
-from app.models.agent_model import AgentModel, AgentType
-from app.models.base_model import get_db
-from app.models.user_model import UserModel
+from starlette.websockets import WebSocket
from app.utils.excelmerge.conformity import run_conformity
import shutil
import os
@@ -18,17 +11,17 @@
EXCEL_FILES_PATH = 'data/output'
SOURCE_FILES_PATH = 'data/source'
-def allowed_file(filename):
+
+def allowed_file(filename: str) -> bool:
return '.' in filename and filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS
-def create_dir_if_not_exists(path):
+def create_dir_if_not_exists(path: str):
if not os.path.exists(path):
os.makedirs(path)
-# 娓呯悊鍑芥暟
-def clear_directory(path):
+def clear_directory(path: str) -> dict:
for filename in os.listdir(path):
file_path = os.path.join(path, filename)
try:
@@ -41,68 +34,109 @@
return {"message": "鐩綍宸叉竻绌�"}
+def user_file_path(userid: str, path: str) -> str:
+ return os.path.join(path, userid)
+
+
@router.post('/excel/upload')
-async def upload_file(files: list[UploadFile] = File(...)):
+async def upload_file(files: list[UploadFile] = File(...), user_id: str = Form(...)):
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)
- create_dir_if_not_exists(SOURCE_FILES_PATH)
- create_dir_if_not_exists(EXCEL_FILES_PATH)
- clear_directory(SOURCE_FILES_PATH)
- clear_directory(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:
if file.filename == '':
return JSONResponse(content={"error": "娌℃湁閫夋嫨鏂囦欢"}, status_code=400)
if file and allowed_file(file.filename):
- filename = secure_filename(file.filename)
- save_path = os.path.join(SOURCE_FILES_PATH, filename)
+ save_path = os.path.join(user_source, file.filename)
with open(save_path, 'wb') as buffer:
shutil.copyfileobj(file.file, buffer)
save_path_list.append(save_path)
else:
return JSONResponse(content={"error": "涓嶅厑璁哥殑鏂囦欢绫诲瀷"}, status_code=400)
- return JSONResponse(content={"message": "鏂囦欢涓婁紶鎴愬姛", "paths": save_path_list}, status_code=201)
+ return JSONResponse(content={"code": 200, "msg": "", "data": {}}, status_code=200)
# ws://localhost:9201/api/document/ws/excel
-@router.websocket("/ws/excel")
-async def ws_excel(websocket: WebSocket):
+@router.websocket("/ws/excel/{user_id}")
+async def ws_excel(websocket: WebSocket, user_id: str):
await websocket.accept()
+
+ user_source = user_file_path(user_id, SOURCE_FILES_PATH)
+ user_excel = user_file_path(user_id, EXCEL_FILES_PATH)
+ create_dir_if_not_exists(user_source)
+ create_dir_if_not_exists(user_excel)
+
while True:
- data = await websocket.receive_json()
- action = data.get("action")
+ data = await websocket.receive_text()
try:
- if action == "process":
- clear_directory(EXCEL_FILES_PATH)
- output_file_path = run_conformity()
- await websocket.send_json({"step_message": "寮�濮嬪悎骞�"})
- elif action == "inquire":
- files = os.listdir(EXCEL_FILES_PATH)
- if not files:
- await websocket.send_json({"step_message": "姝ｅ湪鍚堝苟涓�"})
+ 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}"
+ await websocket.send_json({
+ "message": "鏂囨。鍚堝苟鎴愬姛锛�",
+ "type": "stream",
+ "files": [{
+ "file_name": file_name,
+ "file_url": download_url
+ }]
+ })
+ await websocket.send_json({
+ "message": "鏂囨。鍚堝苟鎴愬姛锛�",
+ "type": "close",
+ })
else:
- await websocket.send_json({"step_message": "鏂囨。鍚堝苟鎴愬姛锛�"})
- elif action == "download":
- files = os.listdir(EXCEL_FILES_PATH)
+ await websocket.send_json({"error": "鍚堝苟澶辫触", "type": "stream", "files": []})
+ elif data == "\"鏌ヨ鍚堝苟杩涘害\"":
+ files = os.listdir(user_excel)
if not files:
- await websocket.send_json({"error": "鐩綍涓嬫病鏈夌敓鎴愮殑鏂囦欢"})
+ 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]
- await websocket.send_json({"step_message": "鍚堝苟鏂囦欢宸茬敓鎴�", "download_url": f"/download/{first_file}"})
+ 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:
- await websocket.send_json({"error": "鏈煡鎸囦护"})
+ print(f"Received data: {data}")
+ await websocket.send_json({"error": "鏈煡鎸囦护", "data": str(data)})
except Exception as e:
await websocket.send_json({"error": str(e)})
+ await websocket.close()
@router.get("/download/{filename}")
-async def download_file(filename: str):
- try:
- return FileResponse(os.path.join(EXCEL_FILES_PATH, filename), filename=filename,
- media_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
- except FileNotFoundError:
- raise HTTPException(status_code=404, detail="鏂囦欢涓嶅瓨鍦�")
- except Exception as e:
- raise HTTPException(status_code=500, detail="鏈嶅姟鍣ㄩ敊璇�")
\ No newline at end of file
+async def download_file(filename: str, user_id: str):
+ user_excel = user_file_path(user_id, EXCEL_FILES_PATH)
+ file_path = os.path.join(user_excel, filename)
+
+ if not os.path.exists(file_path):
+ return JSONResponse(status_code=404, content={"error": "鏂囦欢涓嶅瓨鍦�"})
+
+ return FileResponse(file_path, filename=filename,
+ media_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
--
Gitblit v1.8.0