11

app/api/v1/admin_oem_branding.py

@@ -17,7 +17,7 @@ async def get_oem_branding(
 ) -> ApiResponse[OemBrandingOut]:
     try:
         oem = await branding_service.get_default_oem_branding(
-            db, owner_user_id=admin.id
+            db, oem_id=1,user_id=admin.id
         )
     except branding_service.AdminOemBrandingError as exc:
         return ApiResponse(ok=False, message=exc.message)
@@ -37,7 +37,7 @@ async def update_oem_branding(
 ) -> ApiResponse[OemBrandingOut]:
     try:
         oem = await branding_service.update_default_oem_branding(
-            db, body, owner_user_id=admin.id
+            db, body, oem_id=1,user_id=admin.id
         )
     except branding_service.AdminOemBrandingError as exc:
         return ApiResponse(ok=False, message=exc.message)

app/api/v1/oem_desktop_configs.py

@@ -1,4 +1,4 @@
-"""管理员 desktop_configs 键值 CRUD。"""
+"""OEM 桌面配置 CRUD（仅当前 OEM 数据）。"""
 
 from fastapi import APIRouter, Query
 
@@ -11,12 +11,12 @@ from app.schemas.admin_desktop_config import (
 from app.schemas.common import ApiResponse, PaginatedData
 from app.services import oem_desktop_config as config_service
 
-router = APIRouter(prefix="/oem/desktop-configs", tags=["管理-桌面配置"])
+router = APIRouter(prefix="/oem/desktop-configs", tags=["OEM-桌面配置"])
 
 
 @router.get("", response_model=ApiResponse[PaginatedData[DesktopConfigOut]])
 async def list_configs(
-    _oem: OemUser,
+    oem: OemUser,
     db: DbSession,
     page: int = Query(1, ge=1),
     page_size: int = Query(
@@ -28,6 +28,7 @@ async def list_configs(
 ) -> ApiResponse[PaginatedData[DesktopConfigOut]]:
     rows, total = await config_service.list_configs(
         db,
+        oem_user=oem,
         page=page,
         page_size=page_size,
         keyword=keyword,
@@ -47,12 +48,12 @@ async def list_configs(
 @router.post("", response_model=ApiResponse[DesktopConfigOut])
 async def create_config(
     body: DesktopConfigCreate,
-    _oem: OemUser,
+    oem: OemUser,
     db: DbSession,
 ) -> ApiResponse[DesktopConfigOut]:
     try:
-        row = await config_service.create_config(db, body)
-    except config_service.AdminDesktopConfigError as exc:
+        row = await config_service.create_config(db, body, oem_user=oem)
+    except config_service.OemDesktopConfigError as exc:
         return ApiResponse(ok=False, message=exc.message)
 
     return ApiResponse(
@@ -66,12 +67,12 @@ async def create_config(
 async def update_config(
     config_id: int,
     body: DesktopConfigUpdate,
-    _oem: OemUser,
+    oem: OemUser,
     db: DbSession,
 ) -> ApiResponse[DesktopConfigOut]:
     try:
-        row = await config_service.update_config(db, config_id, body)
-    except config_service.AdminDesktopConfigError as exc:
+        row = await config_service.update_config(db, config_id, body, oem_user=oem)
+    except config_service.OemDesktopConfigError as exc:
         return ApiResponse(ok=False, message=exc.message)
 
     return ApiResponse(
@@ -84,12 +85,12 @@ async def update_config(
 @router.delete("/{config_id}", response_model=ApiResponse[None])
 async def delete_config(
     config_id: int,
-    _oem: OemUser,
+    oem: OemUser,
     db: DbSession,
 ) -> ApiResponse[None]:
     try:
-        await config_service.delete_config(db, config_id)
-    except config_service.AdminDesktopConfigError as exc:
+        await config_service.delete_config(db, config_id, oem_user=oem)
+    except config_service.OemDesktopConfigError as exc:
         return ApiResponse(ok=False, message=exc.message)
 
     return ApiResponse(ok=True, message="配置已删除")

app/api/v1/oem_oem_branding.py

@@ -5,7 +5,7 @@ from fastapi import APIRouter
 from app.dependencies import OemUser, DbSession
 from app.schemas.admin_oem_branding import OemBrandingOut, OemBrandingUpdate
 from app.schemas.common import ApiResponse
-from app.services import admin_oem_branding as branding_service
+from app.services import oem_oem_branding as branding_service
 
 router = APIRouter(prefix="/oem/oem-branding", tags=["管理-OEM品牌"])
 
@@ -17,7 +17,7 @@ async def get_oem_branding(
 ) -> ApiResponse[OemBrandingOut]:
     try:
         oem = await branding_service.get_default_oem_branding(
-            db, owner_user_id=admin.id
+            db, oem_id=1,user_id=admin.id
         )
     except branding_service.AdminOemBrandingError as exc:
         return ApiResponse(ok=False, message=exc.message)
@@ -37,7 +37,7 @@ async def update_oem_branding(
 ) -> ApiResponse[OemBrandingOut]:
     try:
         oem = await branding_service.update_default_oem_branding(
-            db, body, owner_user_id=admin.id
+            db, body, oem_id=admin.id,user_id=admin.id
         )
     except branding_service.AdminOemBrandingError as exc:
         return ApiResponse(ok=False, message=exc.message)