11

app/api/v1/agent_card_keys.py

@@ -4,7 +4,7 @@ from typing import Literal
 
 from fastapi import APIRouter, Query
 
-from app.dependencies import AdminUser, DbSession
+from app.dependencies import AgentUser, DbSession
 from app.schemas.admin_card_key import (
     CardKeyBatchCreateResult,
     CardKeyCreate,
@@ -12,14 +12,14 @@ from app.schemas.admin_card_key import (
     CardKeyUpdate,
 )
 from app.schemas.common import ApiResponse, PaginatedData
-from app.services import admin_card_key as card_key_service
+from app.services import agent_card_key as card_key_service
 
 router = APIRouter(prefix="/agent/card-keys", tags=["管理-卡密"])
 
 
 @router.get("", response_model=ApiResponse[PaginatedData[CardKeyOut]])
 async def list_card_keys(
-    _admin: AdminUser,
+    _agent: AgentUser,
     db: DbSession,
     page: int = Query(1, ge=1),
     page_size: int = Query(
@@ -42,8 +42,7 @@ async def list_card_keys(
         page_size=page_size,
         status=filter_status,
         username=username,
-        oem_id=oem_id,
-        agent_id=agent_id,
+        agent_id=_agent.id,
     )
     return ApiResponse(
         ok=True,
@@ -60,7 +59,7 @@ async def list_card_keys(
 @router.post("", response_model=ApiResponse[CardKeyBatchCreateResult])
 async def create_card_keys(
     body: CardKeyCreate,
-    _admin: AdminUser,
+    _admin: AgentUser,
     db: DbSession,
 ) -> ApiResponse[CardKeyBatchCreateResult]:
     try:
@@ -80,7 +79,7 @@ async def create_card_keys(
 async def update_card_key(
     card_id: int,
     body: CardKeyUpdate,
-    _admin: AdminUser,
+    _admin: AgentUser,
     db: DbSession,
 ) -> ApiResponse[CardKeyOut]:
     try:
@@ -98,7 +97,7 @@ async def update_card_key(
 @router.delete("/{card_id}", response_model=ApiResponse[None])
 async def delete_card_key(
     card_id: int,
-    _admin: AdminUser,
+    _admin: AgentUser,
     db: DbSession,
 ) -> ApiResponse[None]:
     try:

app/api/v1/agent_users.py

@@ -2,37 +2,37 @@
 
 from fastapi import APIRouter, Query
 
-from app.dependencies import OemUser, DbSession
+from app.dependencies import AgentUser, DbSession
 from app.schemas.admin_user import AdminUserCreate, AdminUserOut, AdminUserUpdate
 from app.schemas.common import ApiResponse, PaginatedData
-from app.services import admin_user as oem_user_service
+from app.services import agent_user as agent_user_service
 
 router = APIRouter(prefix="/agent/users", tags=["管理-用户"])
 
 
 @router.get("", response_model=ApiResponse[PaginatedData[AdminUserOut]])
 async def list_users(
-    _oem: OemUser,
+    _agent: AgentUser,
     db: DbSession,
     page: int = Query(1, ge=1, description="页码，从 1 开始"),
     page_size: int = Query(
-        oem_user_service.DEFAULT_PAGE_SIZE,
+        agent_user_service.DEFAULT_PAGE_SIZE,
         ge=1,
-        le=oem_user_service.MAX_PAGE_SIZE,
+        le=agent_user_service.MAX_PAGE_SIZE,
         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]]:
-    oem_id=_oem.id
-    users, total = await oem_user_service.list_users(
+    agent_id=_agent.id
+    users, total = await agent_user_service.list_users(
         db,
         page=page,
         page_size=page_size,
         username=username,
-        oem_id=oem_id,
         agent_id=agent_id,
+       
         role_id=role_id,
     )
     return ApiResponse(
@@ -50,12 +50,12 @@ async def list_users(
 @router.post("", response_model=ApiResponse[AdminUserOut])
 async def create_user(
     body: AdminUserCreate,
-    oem: OemUser,
+    agent: AgentUser,
     db: DbSession,
 ) -> ApiResponse[AdminUserOut]:
     try:
-        user = await oem_user_service.create_user(db, body,oem)
-    except oem_user_service.AdminUserError as exc:
+        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(
@@ -69,17 +69,17 @@ async def create_user(
 async def update_user(
     user_id: int,
     body: AdminUserUpdate,
-    oem: OemUser,
+    agent: AgentUser,
     db: DbSession,
 ) -> ApiResponse[AdminUserOut]:
     try:
-        user = await oem_user_service.update_user(
+        user = await agent_user_service.update_user(
             db,
             user_id,
             body,
-            actor_id=oem.id,
+            actor_id=agent.id,
         )
-    except oem_user_service.AdminUserError as exc:
+    except agent_user_service.AdminUserError as exc:
         return ApiResponse(ok=False, message=exc.message)
 
     return ApiResponse(
@@ -92,12 +92,12 @@ async def update_user(
 @router.delete("/{user_id}", response_model=ApiResponse[None])
 async def delete_user(
     user_id: int,
-    oem: OemUser,
+    agent: AgentUser,
     db: DbSession,
 ) -> ApiResponse[None]:
     try:
-        await oem_user_service.delete_user(db, user_id, actor_id=admin.id)
-    except oem_user_service.AdminUserError as exc:
+        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="用户已删除")