From 0d47f33ade622e3951ba4f1c460e92599579bebd Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期二, 21 一月 2025 17:01:25 +0800
Subject: [PATCH] 上传excel返回json保持相同
---
app/api/excel.py | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index 1661fe4..5db60db 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -6,7 +6,7 @@
from sqlalchemy.orm import Session
from starlette.websockets import WebSocket
-from app.api import get_current_user, get_current_user_websocket
+from app.api import get_current_user, get_current_user_websocket, Response
from app.models import UserModel, AgentType
from app.models.base_model import get_db
from app.service.session import SessionService
@@ -64,13 +64,13 @@
return session
-@router.post('/excel/upload')
+@router.post('/excel/upload', response_model=Response)
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)
+ return Response(code=400, msg="娌℃湁鏂囦欢閮ㄥ垎", data={})
if not user_id:
- return JSONResponse(content={"error": "缂哄皯鍙傛暟user_id"}, status_code=400)
+ return Response(code=400, msg="缂哄皯鍙傛暟user_id", data={})
user_source = user_file_path(user_id, SOURCE_FILES_PATH)
user_excel = EXCEL_FILES_PATH
@@ -80,16 +80,14 @@
save_path_list = []
for file in files:
- if file.filename == '':
- return JSONResponse(content={"error": "娌℃湁閫夋嫨鏂囦欢"}, status_code=400)
if file and allowed_file(file.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={"code": 200, "msg": "", "data": {}}, status_code=200)
+ return Response(code=400, msg="涓嶅厑璁哥殑鏂囦欢绫诲瀷", data={})
+ return Response(code=200, msg="涓婁紶鎴愬姛", data={})
# ws://localhost:9201/api/document/ws/excel
--
Gitblit v1.8.0