浏览代码

上传excel返回json保持相同

xuyonghao 1 年之前
父节点
当前提交
0d47f33ade
共有 1 个文件被更改,包括 6 次插入8 次删除
  1. 6 8
      app/api/excel.py

+ 6 - 8
app/api/excel.py

@@ -6,7 +6,7 @@ from fastapi.responses import JSONResponse, FileResponse
 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 @@ def db_create_session(db: Session, user_id: str):
     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 @@ async def upload_file(files: list[UploadFile] = File(...), current_user: UserMod
 
     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