Update the dict plugin crud

Author: wu-clan

backend/plugin/dict/crud/crud_dict_data.py

@@ -19,7 +19,7 @@ async def get(self, db: AsyncSession, pk: int) -> DictData | None:
         :param pk: 字典数据 ID
         :return:
         """
-        return await self.select_model(db, pk, load_strategies={'type': 'noload'})
+        return await self.select_model(db, pk)
 
     async def get_by_type_code(self, db: AsyncSession, type_code: str) -> Sequence[DictData]:
         """
@@ -34,7 +34,6 @@ async def get_by_type_code(self, db: AsyncSession, type_code: str) -> Sequence[D
             sort_columns='sort',
             sort_orders='desc',
             type_code=type_code,
-            load_strategies={'type': 'noload'},
         )
 
     async def get_all(self, db: AsyncSession) -> Sequence[DictData]:
@@ -44,7 +43,7 @@ async def get_all(self, db: AsyncSession) -> Sequence[DictData]:
         :param db: 数据库会话
         :return:
         """
-        return await self.select_models(db, load_strategies={'type': 'noload'})
+        return await self.select_models(db)
 
     async def get_select(
         self,
@@ -77,7 +76,7 @@ async def get_select(
         if type_id is not None:
             filters['type_id'] = type_id
 
-        return await self.select_order('id', 'desc', load_strategies={'type': 'noload'}, **filters)
+        return await self.select_order('id', 'desc', **filters)
 
     async def get_by_label_and_type_code(self, db: AsyncSession, label: str, type_code: str) -> DictData | None:
         """
@@ -128,15 +127,15 @@ async def delete(self, db: AsyncSession, pks: list[int]) -> int:
         """
         return await self.delete_model_by_column(db, allow_multiple=True, id__in=pks)
 
-    async def get_with_relation(self, db: AsyncSession, pk: int) -> DictData | None:
+    async def delete_by_type_id(self, db: AsyncSession, type_ids: list[int]) -> int:
         """
-        获取字典数据及关联数据
+        通过类型 ID 删除字典数据
 
         :param db: 数据库会话
-        :param pk: 字典数据 ID
+        :param type_ids: 字典类型 ID 列表
         :return:
         """
-        return await self.select_model(db, pk, load_strategies=['type'])
+        return await self.delete_model_by_column(db, allow_multiple=True, type_id__in=type_ids)
 
 
 dict_data_dao: CRUDDictData = CRUDDictData(DictData)

backend/plugin/dict/crud/crud_dict_type.py

@@ -1,9 +1,11 @@
 from collections.abc import Sequence
+from typing import Any
 
-from sqlalchemy import Select
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy_crud_plus import CRUDPlus
 
+from backend.common.pagination import paging_data
+from backend.plugin.dict.crud.crud_dict_data import dict_data_dao
 from backend.plugin.dict.model import DictType
 from backend.plugin.dict.schema.dict_type import CreateDictTypeParam, UpdateDictTypeParam
 
@@ -28,12 +30,13 @@ async def get_all(self, db: AsyncSession) -> Sequence[DictType]:
         :param db: 数据库会话
         :return:
         """
-        return await self.select_models(db, load_strategies={'datas': 'noload'})
+        return await self.select_models(db)
 
-    async def get_select(self, *, name: str | None, code: str | None) -> Select:
+    async def get_paginated(self, db: AsyncSession, name: str | None, code: str | None) -> dict[str, Any]:
         """
-        获取字典类型列表查询表达式
+        获取用户分页
 
+        :param db: 数据库会话
         :param name: 字典类型名称
         :param code: 字典类型编码
         :return:
@@ -45,7 +48,8 @@ async def get_select(self, *, name: str | None, code: str | None) -> Select:
         if code is not None:
             filters['code__like'] = f'%{code}%'
 
-        return await self.select_order('id', 'desc', load_strategies={'datas': 'noload'}, **filters)
+        dict_type_select = await self.select_order('id', 'desc', **filters)
+        return await paging_data(db, dict_type_select)
 
     async def get_by_code(self, db: AsyncSession, code: str) -> DictType | None:
         """
@@ -86,6 +90,7 @@ async def delete(self, db: AsyncSession, pks: list[int]) -> int:
         :param pks: 字典类型 ID 列表
         :return:
         """
+        await dict_data_dao.delete_by_type_id(db, pks)
         return await self.delete_model_by_column(db, allow_multiple=True, id__in=pks)
 
 

backend/plugin/dict/service/dict_type_service.py

@@ -4,7 +4,6 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from backend.common.exception import errors
-from backend.common.pagination import paging_data
 from backend.plugin.dict.crud.crud_dict_type import dict_type_dao
 from backend.plugin.dict.model import DictType
 from backend.plugin.dict.schema.dict_type import CreateDictTypeParam, DeleteDictTypeParam, UpdateDictTypeParam
@@ -49,8 +48,7 @@ async def get_list(*, db: AsyncSession, name: str | None, code: str | None) -> d
         :param code: 字典类型编码
         :return:
         """
-        dict_type_select = await dict_type_dao.get_select(name=name, code=code)
-        return await paging_data(db, dict_type_select)
+        return await dict_type_dao.get_paginated(db=db, name=name, code=code)
 
     @staticmethod
     async def create(*, db: AsyncSession, obj: CreateDictTypeParam) -> None: