11
This commit is contained in:
@@ -1,18 +1,18 @@
|
||||
"""管理员用户 CRUD。"""
|
||||
"""代理:仅查看名下用户(agent_id 匹配)。"""
|
||||
|
||||
from fastapi import APIRouter, Query
|
||||
|
||||
from app.dependencies import AgentUser, DbSession
|
||||
from app.schemas.admin_user import AdminUserCreate, AdminUserOut, AdminUserUpdate
|
||||
from app.schemas.admin_user import AdminUserOut
|
||||
from app.schemas.common import ApiResponse, PaginatedData
|
||||
from app.services import agent_user as agent_user_service
|
||||
|
||||
router = APIRouter(prefix="/agent/users", tags=["管理-用户"])
|
||||
router = APIRouter(prefix="/agent/users", tags=["代理-用户"])
|
||||
|
||||
|
||||
@router.get("", response_model=ApiResponse[PaginatedData[AdminUserOut]])
|
||||
async def list_users(
|
||||
_agent: AgentUser,
|
||||
agent: AgentUser,
|
||||
db: DbSession,
|
||||
page: int = Query(1, ge=1, description="页码,从 1 开始"),
|
||||
page_size: int = Query(
|
||||
@@ -22,17 +22,14 @@ async def list_users(
|
||||
description="每页条数",
|
||||
),
|
||||
username: str | None = Query(None, description="用户名模糊搜索"),
|
||||
agent_id: int | None = Query(None, description="按所属代理用户 ID 筛选"),
|
||||
role_id: int | None = Query(None, ge=0, le=3, description="按角色筛选"),
|
||||
) -> ApiResponse[PaginatedData[AdminUserOut]]:
|
||||
agent_id=_agent.id
|
||||
users, total = await agent_user_service.list_users(
|
||||
db,
|
||||
agent_id=agent.id,
|
||||
page=page,
|
||||
page_size=page_size,
|
||||
username=username,
|
||||
agent_id=agent_id,
|
||||
|
||||
role_id=role_id,
|
||||
)
|
||||
return ApiResponse(
|
||||
@@ -45,59 +42,3 @@ async def list_users(
|
||||
page_size=page_size,
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
@router.post("", response_model=ApiResponse[AdminUserOut])
|
||||
async def create_user(
|
||||
body: AdminUserCreate,
|
||||
agent: AgentUser,
|
||||
db: DbSession,
|
||||
) -> ApiResponse[AdminUserOut]:
|
||||
try:
|
||||
user = await agent_user_service.create_user(db, body,agent)
|
||||
except agent_user_service.AdminUserError as exc:
|
||||
return ApiResponse(ok=False, message=exc.message)
|
||||
|
||||
return ApiResponse(
|
||||
ok=True,
|
||||
message="用户已创建",
|
||||
data=AdminUserOut.model_validate(user),
|
||||
)
|
||||
|
||||
|
||||
@router.patch("/{user_id}", response_model=ApiResponse[AdminUserOut])
|
||||
async def update_user(
|
||||
user_id: int,
|
||||
body: AdminUserUpdate,
|
||||
agent: AgentUser,
|
||||
db: DbSession,
|
||||
) -> ApiResponse[AdminUserOut]:
|
||||
try:
|
||||
user = await agent_user_service.update_user(
|
||||
db,
|
||||
user_id,
|
||||
body,
|
||||
actor_id=agent.id,
|
||||
)
|
||||
except agent_user_service.AdminUserError as exc:
|
||||
return ApiResponse(ok=False, message=exc.message)
|
||||
|
||||
return ApiResponse(
|
||||
ok=True,
|
||||
message="用户已更新",
|
||||
data=AdminUserOut.model_validate(user),
|
||||
)
|
||||
|
||||
|
||||
@router.delete("/{user_id}", response_model=ApiResponse[None])
|
||||
async def delete_user(
|
||||
user_id: int,
|
||||
agent: AgentUser,
|
||||
db: DbSession,
|
||||
) -> ApiResponse[None]:
|
||||
try:
|
||||
await agent_user_service.delete_user(db, user_id, actor_id=agent.id)
|
||||
except agent_user_service.AdminUserError as exc:
|
||||
return ApiResponse(ok=False, message=exc.message)
|
||||
|
||||
return ApiResponse(ok=True, message="用户已删除")
|
||||
|
||||
Reference in New Issue
Block a user