From 72a8a0a1ad6b79b8e9fb2facef121f9b5d584666 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期六, 08 二月 2025 10:56:30 +0800
Subject: [PATCH] 报表合并历史记录功能
---
app/api/user.py | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/app/api/user.py b/app/api/user.py
index 1e2db47..90a23cd 100644
--- a/app/api/user.py
+++ b/app/api/user.py
@@ -1,16 +1,17 @@
from fastapi import APIRouter, Depends
from app.api import Response, pwd_context, get_current_user
+from app.models.public_api_model import AppRegisterModel
from app.models.base_model import get_db
from app.models.user import PageParameter, UserStatus, UserInfo, LoginData
from app.models.user_model import UserModel
from app.service.user import get_user_list, edit_user_status, delete_user_data, create_user, edit_user_data, \
- edit_user_pwd
+ edit_user_pwd, get_user_info, get_user_routers
user_router = APIRouter()
@user_router.get("/list", response_model=Response)
-async def user_list(current, pageSize, keyword="", current_user: UserModel = Depends(get_current_user),
+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))
@@ -74,11 +75,24 @@
@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)):
- 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_pwd(db, user.userId)
+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)
\ No newline at end of file
--
Gitblit v1.8.0