素材列表展示

video-gen-api/app/api/v1/__init__.py

@@ -24,6 +24,7 @@ from app.api.v1.upload_material import router as upload_material_router
 from app.api.v1.pre_test_template import router as pre_test_template_router
 from app.api.v1.material_consumption import router as material_consumption_router
 from app.api.v1.open_type import router as open_type_router
+from app.api.v1.resources_material import router as resources_material_router
 from app.api.admin import router as admin_module_router
 
 api_router = APIRouter()
@@ -51,4 +52,5 @@ api_router.include_router(upload_material_router)
 api_router.include_router(pre_test_template_router)
 api_router.include_router(material_consumption_router)
 api_router.include_router(open_type_router)
+api_router.include_router(resources_material_router)
 api_router.include_router(admin_module_router)

video-gen-api/app/api/v1/resources_material.py

@@ -0,0 +1,45 @@
+from typing import Any, Optional
+
+from fastapi import APIRouter, Depends, Query
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.dependencies import get_db
+from app.schemas.resources_material import ResourcesMaterialListResponse
+from app.services.resources_material_service import get_resources_material_list
+
+router = APIRouter(prefix="/resources-material", tags=["resources-material"])
+
+
+@router.get(
+    "/list",
+    summary="查询素材列表",
+    description="通过advertiser_id，material_id，upload_id，resource_type查询素材列表，同时返回关联的资源信息",
+    response_model=ResourcesMaterialListResponse,
+)
+async def get_resources_material_list_api(
+    advertiser_id: Optional[str] = Query(None, description="广告主id"),
+    material_id: Optional[str] = Query(None, description="素材id"),
+    upload_id: Optional[str] = Query(None, description="上传资源平台id"),
+    file_name: Optional[str] = Query(None, description="文件名"),
+    resource_type: Optional[str] = Query(None, description="资源类型，image或者video"),
+    page: int = Query(1, description="页码"),
+    page_size: int = Query(20, description="每页数量"),
+    db: AsyncSession = Depends(get_db),
+) -> Any | dict:
+    items, total = await get_resources_material_list(
+        db=db,
+        advertiser_id=advertiser_id,
+        material_id=material_id,
+        upload_id=upload_id,
+        file_name=file_name,
+        resource_type=resource_type,
+        page=page,
+        page_size=page_size,
+    )
+
+    return {
+        "code": 0,
+        "message": "查询成功",
+        "data": items,
+        "total": total,
+    }

video-gen-api/app/api/v1/upload_material.py

@@ -351,18 +351,25 @@ async def get_upload_history(
     current_user: User = Depends(get_current_user),
     db: AsyncSession = Depends(get_db),
 ) -> Any | dict:
-    from app.services.upload_material_service import get_upload_history as get_upload_history_service
+    try:
+        from app.services.upload_material_service import get_upload_history as get_upload_history_service
+        result = await get_upload_history_service(
+            user_id=current_user.id,
+            db=db,
+            page=page,
+            page_size=page_size,
+            status=status,
+        )
+        
+        return {
+            "code": 0,
+            "data": result["data"],
+            "pagination": result["pagination"],
+        }
+    except Exception as e:
+        return {
+            "code": 0,
+            "message": f"查询上传任务历史失败：{str(e)}",
+        }
     
-    result = await get_upload_history_service(
-        user_id=current_user.id,
-        db=db,
-        page=page,
-        page_size=page_size,
-        status=status,
-    )
-    
-    return {
-        "code": 0,
-        "data": result["data"],
-        "pagination": result["pagination"],
-    }
+