diff --git a/backend/templates/py/api.jinja b/backend/templates/py/api.jinja index 56169e30..7b07ff94 100644 --- a/backend/templates/py/api.jinja +++ b/backend/templates/py/api.jinja @@ -19,7 +19,7 @@ router = APIRouter() @router.get('/{pk}', summary='获取{{ table_simple_name_zh }}详情', dependencies=[DependsJwtAuth]) async def get_{{ table_name_en }}(pk: Annotated[int, Path(...)]) -> ResponseModel: {{ table_name_en }} = await {{ table_name_en }}_service.get(pk=pk) - return await response_base.success(data={{ table_name_en }}) + return response_base.success(data={{ table_name_en }}) @router.get( @@ -33,7 +33,7 @@ async def get_{{ table_name_en }}(pk: Annotated[int, Path(...)]) -> ResponseMode async def get_pagination_{{ table_name_en }}(db: CurrentSession) -> ResponseModel: {{ table_name_en }}_select = await {{ table_name_en }}_service.get_select() page_data = await paging_data(db, {{ table_name_en }}_select, Get{{ schema_name }}ListDetails) - return await response_base.success(data=page_data) + return response_base.success(data=page_data) @router.post( @@ -46,7 +46,7 @@ async def get_pagination_{{ table_name_en }}(db: CurrentSession) -> ResponseMode ) async def create_{{ table_name_en }}(obj: Create{{ schema_name }}Param) -> ResponseModel: await {{ table_name_en }}_service.create(obj=obj) - return await response_base.success() + return response_base.success() @router.put( @@ -61,7 +61,7 @@ async def update_{{ table_name_en }}(pk: Annotated[int, Path(...)], obj: Update{ count = await {{ table_name_en }}_service.update(pk=pk, obj=obj) if count > 0: return await response_base.success() - return await response_base.fail() + return response_base.fail() @router.delete( @@ -76,4 +76,4 @@ async def delete_{{ table_name_en }}(pk: Annotated[list[int], Query(...)]) -> Re count = await {{ table_name_en }}_service.delete(pk=pk) if count > 0: return await response_base.success() - return await response_base.fail() + return response_base.fail() diff --git a/backend/templates/py/crud.jinja b/backend/templates/py/crud.jinja index c5e5fed0..6a8fd820 100644 --- a/backend/templates/py/crud.jinja +++ b/backend/templates/py/crud.jinja @@ -19,7 +19,7 @@ class CRUD{{ table_name_class }}(CRUDPlus[{{ schema_name }}]): :param pk: :return: """ - return await self.select_model_by_id(db, pk) + return await self.select_model(db, pk) async def get_all(self, db: AsyncSession) -> Sequence[{{ table_name_class }}]: """ @@ -59,8 +59,7 @@ class CRUD{{ table_name_class }}(CRUDPlus[{{ schema_name }}]): :param pk: :return: """ - {{ table_name_en }}s = await db.execute(delete(self.model).where(self.model.id.in_(pk))) - return {{ table_name_en }}s.rowcount + return await self.delete_model_by_column(db, allow_multiple=True, id__in=pk) {{ table_name_en }}_dao: CRUD{{ table_name_class }} = CRUD{{ table_name_class }}({{ table_name_class }})