From 08c8e8c9a4d65677de6a493446a605d70efee631 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 10 十二月 2024 16:32:07 +0800
Subject: [PATCH] 12.10 16
---
app/api/user.py | 111 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 91 insertions(+), 20 deletions(-)
diff --git a/app/api/user.py b/app/api/user.py
index ca725f4..b5bd520 100644
--- a/app/api/user.py
+++ b/app/api/user.py
@@ -1,35 +1,106 @@
from fastapi import APIRouter, Depends
from app.api import Response, pwd_context, get_current_user, ResponseList
-from app.config.config import settings
+from app.models.public_api_model import AppRegisterModel
from app.models.base_model import get_db
-from app.models.group_model import UserGroupModel
+from app.models.user import PageParameter, UserStatus, UserInfo, LoginData
from app.models.user_model import UserModel
-from app.service.bisheng import BishengService
-from app.service.ragflow import RagflowService
-from app.service.token import get_bisheng_token
+from app.service.user import get_user_list, edit_user_status, delete_user_data, create_user, edit_user_data, \
+ edit_user_pwd, get_user_info, get_user_routers, get_user_menus
user_router = APIRouter()
-@user_router.post("/list", response_model=Response)
-async def user_list(current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
+@user_router.get("/list", response_model=Response)
+async def user_list(current:int, pageSize:int, keyword="", current_user: UserModel = Depends(get_current_user),
+ db=Depends(get_db)):
+ return Response(code=200, msg="", data=await get_user_list(db, current, pageSize, keyword,
+ current_user.permission, current_user.id))
- bisheng_service = BishengService(settings.sgb_base_url)
- ragflow_service = RagflowService(settings.fwr_base_url)
- db_user = db.query(UserModel).filter(UserGroupModel.group_name == UserModel.username).first()
+
+@user_router.post("/add_user", response_model=Response)
+async def add_user(user: UserInfo, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
+ if not user.userName:
+ return Response(code=400, msg="The userName cannot be empty!")
+ db_user = db.query(UserModel).filter(UserModel.username == user.userName).first()
if db_user:
- return Response(code=200, msg="Username already registered")
- # 娉ㄥ唽鍒版瘯鏄�
- try:
- token = get_bisheng_token(db, current_user.id)
- print(token)
- result = await bisheng_service.user_list(token)
- print(result)
- except Exception as e:
- return Response(code=500, msg=f"Failed to register with Bisheng: {str(e)}")
+ return Response(code=200, msg="user already created")
+ pwd = user.pwd
+ if not pwd:
+ pwd = "000000"
+ is_create = await create_user(db, user.userName, user.email, user.phone, user.loginName, pwd, user.roles,
+ user.groups, current_user.id)
+ if not is_create:
+ return Response(code=500, msg="user create failure", data={})
+ return Response(code=200, msg="user create successfully", data={})
- return ResponseList(code=200, msg="", data=result)
+@user_router.put("/edit_user", response_model=Response)
+async def edit_user(user: UserInfo, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
+ # if not user.userName:
+ # return Response(code=400, msg="The userName cannot be empty!")
+ user_info = db.query(UserModel).filter(UserModel.id == user.userId).first()
+ if not user_info:
+ return Response(code=200, msg="user does not exist")
+ # db_user = db.query(UserModel).filter(UserModel.username == user.userName).first()
+ # if db_user and db_user.id != user.userId:
+ # return Response(code=200, msg="user already created")
+ is_edit = await edit_user_data(db, user.userId, user.email, user.phone, user.loginName, user.roles, user.groups)
+ if not is_edit:
+ return Response(code=500, msg="user edit failure", data={})
+ return Response(code=200, msg="user edit successfully", data={})
+@user_router.put("/change_status", response_model=Response)
+async def change_user_status(user: UserStatus, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
+ if user.status not in ["0", "1"]:
+ return Response(code=400, msg="The status cannot be {}!".format(user.status))
+ db_user = db.query(UserModel).filter(UserModel.id == user.userId).first()
+ if not db_user:
+ return Response(code=200, msg="user does not exist")
+ is_edit = await edit_user_status(db, user.status, user.userId)
+ if not is_edit:
+ return Response(code=500, msg="user status edit failure", data={})
+ return Response(code=200, msg="user status edit successfully", data={})
+
+@user_router.delete("/delete_user/{user_id}", response_model=Response)
+async def delete_user(user_id, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
+ db_user = db.query(UserModel).filter(UserModel.id == user_id).first()
+ if not db_user:
+ return Response(code=200, msg="user does not exist")
+ is_edit = await delete_user_data(db, user_id)
+ if not is_edit:
+ return Response(code=500, msg="user delete failure", data={})
+ return Response(code=200, msg="user delete successfully", data={})
+
+
+@user_router.put("/reset_pwd", response_model=Response)
+async def reset_user_pwd(user: UserStatus, current_user: UserModel = Depends(get_current_user),db=Depends(get_db)):
+ is_edit = await edit_user_pwd(db, user.userId, current_user.id)
+ if not is_edit:
+ return Response(code=500, msg="user pwd reset failure", data={})
+ return Response(code=200, msg="user pwd reset successfully", data={})
+
+
+@user_router.get("/user_info", response_model=Response)
+async def user_info(current_user: UserModel = Depends(get_current_user),db=Depends(get_db)):
+ user_info = await get_user_info(db, current_user.id)
+ if not user_info:
+ return Response(code=500, msg="user get failure", data={})
+ return Response(code=200, msg="successfully", data=user_info)
+
+
+@user_router.get("/user_routers", response_model=Response)
+async def user_routers(current_user: UserModel = Depends(get_current_user),db=Depends(get_db)):
+ routers = await get_user_routers(db, current_user.id)
+ if not routers:
+ return Response(code=500, msg="user get failure", data={})
+ return Response(code=200, msg="successfully", data=routers)
+
+
+@user_router.get("/menus", response_model=ResponseList)
+async def user_menus(current_user: UserModel = Depends(get_current_user),db=Depends(get_db)):
+ menus = await get_user_menus(db, current_user.id)
+ # return Response(code=200, msg="successfully", data=menus)
+ # result = [item.to_dict() for item in agents]
+ return ResponseList(code=200, msg="successfully", data=menus)
\ No newline at end of file
--
Gitblit v1.8.0