Update jinja templates

Author: wu-clan

backend/app/admin/crud/crud_data_rule.py

@@ -79,7 +79,7 @@ async def update(self, db: AsyncSession, pk: int, obj: UpdateDataRuleParam) -> i
 
     async def delete(self, db: AsyncSession, pks: list[int]) -> int:
         """
-        删除规则
+        批量删除规则
 
         :param db: 数据库会话
         :param pks: 规则 ID 列表

backend/app/admin/crud/crud_data_scope.py

@@ -107,7 +107,7 @@ async def update_rules(self, db: AsyncSession, pk: int, rule_ids: UpdateDataScop
 
     async def delete(self, db: AsyncSession, pks: list[int]) -> int:
         """
-        删除数据范围
+        批量删除数据范围
 
         :param db: 数据库会话
         :param pks: 范围 ID 列表

backend/app/admin/crud/crud_login_log.py

@@ -43,7 +43,7 @@ async def create(self, db: AsyncSession, obj: CreateLoginLogParam) -> None:
 
     async def delete(self, db: AsyncSession, pks: list[int]) -> int:
         """
-        删除登录日志
+        批量删除登录日志
 
         :param db: 数据库会话
         :param pks: 登录日志 ID 列表

backend/app/admin/crud/crud_opera_log.py

@@ -43,7 +43,7 @@ async def create(self, db: AsyncSession, obj: CreateOperaLogParam) -> None:
 
     async def delete(self, db: AsyncSession, pks: list[int]) -> int:
         """
-        删除操作日志
+        批量删除操作日志
 
         :param db: 数据库会话
         :param pks: 操作日志 ID 列表

backend/app/admin/crud/crud_role.py

@@ -134,15 +134,15 @@ async def update_scopes(self, db: AsyncSession, role_id: int, scope_ids: UpdateR
         current_role.scopes = scopes.scalars().all()
         return len(current_role.scopes)
 
-    async def delete(self, db: AsyncSession, role_id: list[int]) -> int:
+    async def delete(self, db: AsyncSession, role_ids: list[int]) -> int:
         """
-        删除角色
+        批量删除角色
 
         :param db: 数据库会话
-        :param role_id: 角色 ID 列表
+        :param role_ids: 角色 ID 列表
         :return:
         """
-        return await self.delete_model_by_column(db, allow_multiple=True, id__in=role_id)
+        return await self.delete_model_by_column(db, allow_multiple=True, id__in=role_ids)
 
 
 role_dao: CRUDRole = CRUDRole(Role)

backend/plugin/code_generator/templates/python/api.jinja

@@ -4,7 +4,12 @@ from typing import Annotated
 
 from fastapi import APIRouter, Depends, Path, Query
 
-from backend.app.{{ app_name }}.schema.{{ table_name }} import Create{{ schema_name }}Param, Get{{ schema_name }}Detail, Update{{ schema_name }}Param
+from backend.app.{{ app_name }}.schema.{{ table_name }} import (
+    Create{{ schema_name }}Param,
+    Delete{{ schema_name }}Param,
+    Get{{ schema_name }}Detail,
+    Update{{ schema_name }}Param,
+)
 from backend.app.{{ app_name }}.service.{{ table_name }}_service import {{ table_name }}_service
 from backend.common.pagination import DependsPagination, PageData, paging_data
 from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
@@ -30,7 +35,7 @@ async def get_{{ table_name }}(pk: Annotated[int, Path(description='{{ doc_comme
         DependsPagination,
     ],
 )
-async def get_pagination_{{ table_name }}s(db: CurrentSession) -> ResponseSchemaModel[PageData[Get{{ schema_name }}Detail]]:
+async def get_{{ table_name }}s_paged(db: CurrentSession) -> ResponseSchemaModel[PageData[Get{{ schema_name }}Detail]]:
     {{ table_name }}_select = await {{ table_name }}_service.get_select()
     page_data = await paging_data(db, {{ table_name }}_select)
     return response_base.success(data=page_data)
@@ -72,8 +77,8 @@ async def update_{{ table_name }}(pk: Annotated[int, Path(description='{{ doc_co
         DependsRBAC,
     ],
 )
-async def delete_{{ table_name }}(pk: Annotated[list[int], Query(description='{{ doc_comment }} ID 列表')]) -> ResponseModel:
-    count = await {{ table_name }}_service.delete(pk=pk)
+async def delete_{{ table_name }}s(obj: Delete{{ schema_name }}Param) -> ResponseModel:
+    count = await {{ table_name }}_service.delete(obj=obj)
     if count > 0:
         return response_base.success()
     return response_base.fail()

backend/plugin/code_generator/templates/python/crud.jinja

@@ -55,15 +55,15 @@ class CRUD{{ class_name }}(CRUDPlus[{{ schema_name }}]):
         """
         return await self.update_model(db, pk, obj)
 
-    async def delete(self, db: AsyncSession, pk: list[int]) -> int:
+    async def delete(self, db: AsyncSession, pks: list[int]) -> int:
         """
-        删除{{ doc_comment }}
+        批量删除{{ doc_comment }}
 
         :param db: 数据库会话
-        :param pk: {{ doc_comment }} ID
+        :param pks: {{ doc_comment }} ID 列表
         :return:
         """
-        return await self.delete_model_by_column(db, allow_multiple=True, id__in=pk)
+        return await self.delete_model_by_column(db, allow_multiple=True, id__in=pks)
 
 
 {{ instance_name }}_dao: CRUD{{ class_name }} = CRUD{{ class_name }}({{ class_name }})

backend/plugin/code_generator/templates/python/schema.jinja

@@ -23,6 +23,10 @@ class Update{{ schema_name }}Param({{ schema_name }}SchemaBase):
     """更新{{ doc_comment }}参数"""
 
 
+class Delete{{ schema_name }}Param({{ schema_name }}SchemaBase):
+    """更新{{ doc_comment }}参数"""
+
+
 class Get{{ schema_name }}Detail({{ schema_name }}SchemaBase):
     """{{ doc_comment }}详情"""
 

backend/plugin/code_generator/templates/python/service.jinja

@@ -6,7 +6,7 @@ from sqlalchemy import Select
 
 from backend.app.{{ app_name }}.crud.crud_{{ table_name }} import {{ table_name }}_dao
 from backend.app.{{ app_name }}.model import {{ class_name }}
-from backend.app.{{ app_name }}.schema.{{ table_name }} import Create{{ schema_name }}Param, Update{{ schema_name }}Param
+from backend.app.{{ app_name }}.schema.{{ table_name }} import Create{{ schema_name }}Param, Delete{{ schema_name }}Param, Update{{ schema_name }}Param
 from backend.common.exception import errors
 from backend.database.db import async_db_session
 
@@ -63,15 +63,15 @@ class {{ class_name }}Service:
             return count
 
     @staticmethod
-    async def delete(*, pk: list[int]) -> int:
+    async def delete(*, obj: Delete{{ schema_name }}Param) -> int:
         """
         删除{{ doc_comment }}
 
-        :param pk: {{ doc_comment }} ID 列表
+        :param obj: {{ doc_comment }} ID 列表
         :return:
         """
         async with async_db_session.begin() as db:
-            count = await {{ table_name }}_dao.delete(db, pk)
+            count = await {{ table_name }}_dao.delete(db, obj.pks)
             return count
 
 

backend/plugin/config/crud/crud_config.py

@@ -73,7 +73,7 @@ async def update(self, db: AsyncSession, pk: int, obj: UpdateConfigParam) -> int
 
     async def delete(self, db: AsyncSession, pks: list[int]) -> int:
         """
-        删除参数配置
+        批量删除参数配置
 
         :param db: 数据库会话
         :param pks: 参数配置 ID 列表