Update the dict pagination query parameters

Author: wu-clan

backend/plugin/dict/api/v1/sys/dict_data.py

@@ -14,7 +14,6 @@
     CreateDictDataParam,
     DeleteDictDataParam,
     GetDictDataDetail,
-    GetDictDataWithRelation,
     UpdateDictDataParam,
 )
 from backend.plugin.dict.service.dict_data_service import dict_data_service
@@ -31,7 +30,7 @@ async def get_all_dict_datas() -> ResponseSchemaModel[list[GetDictDataDetail]]:
 @router.get('/{pk}', summary='获取字典数据详情', dependencies=[DependsJwtAuth])
 async def get_dict_data(
     pk: Annotated[int, Path(description='字典数据 ID')],
-) -> ResponseSchemaModel[GetDictDataWithRelation]:
+) -> ResponseSchemaModel[GetDictDataDetail]:
     data = await dict_data_service.get(pk=pk)
     return response_base.success(data=data)
 
@@ -49,8 +48,9 @@ async def get_dict_datas_paged(
     label: Annotated[str | None, Query(description='字典数据标签')] = None,
     value: Annotated[str | None, Query(description='字典数据键值')] = None,
     status: Annotated[int | None, Query(description='状态')] = None,
+    type_id: Annotated[int | None, Query(description='字典类型 ID')] = None,
 ) -> ResponseSchemaModel[PageData[GetDictDataDetail]]:
-    dict_data_select = await dict_data_service.get_select(label=label, value=value, status=status)
+    dict_data_select = await dict_data_service.get_select(label=label, value=value, status=status, type_id=type_id)
     page_data = await paging_data(db, dict_data_select)
     return response_base.success(data=page_data)
 

backend/plugin/dict/crud/crud_dict_data.py

@@ -21,7 +21,7 @@ async def get(self, db: AsyncSession, pk: int) -> DictData | None:
         :param pk: 字典数据 ID
         :return:
         """
-        return await self.select_model(db, pk)
+        return await self.select_model(db, pk, load_strategies={'type': 'noload'})
 
     async def get_all(self, db: AsyncSession) -> Sequence[DictData]:
         """
@@ -32,13 +32,14 @@ async def get_all(self, db: AsyncSession) -> Sequence[DictData]:
         """
         return await self.select_models(db, load_strategies={'type': 'noload'})
 
-    async def get_list(self, label: str | None, value: str | None, status: int | None) -> Select:
+    async def get_list(self, label: str | None, value: str | None, status: int | None, type_id: int | None) -> Select:
         """
         获取字典数据列表
 
         :param label: 字典数据标签
         :param value: 字典数据键值
         :param status: 字典状态
+        :param type_id: 字典类型 ID
         :return:
         """
         filters = {}
@@ -49,6 +50,8 @@ async def get_list(self, label: str | None, value: str | None, status: int | Non
             filters['value__like'] = f'%{value}%'
         if status is not None:
             filters['status'] = status
+        if type_id is not None:
+            filters['type_id'] = type_id
 
         return await self.select_order('id', 'desc', load_strategies={'type': 'noload'}, **filters)
 

backend/plugin/dict/schema/dict_data.py

@@ -6,7 +6,6 @@
 
 from backend.common.enums import StatusType
 from backend.common.schema import SchemaBase
-from backend.plugin.dict.schema.dict_type import GetDictTypeDetail
 
 
 class DictDataSchemaBase(SchemaBase):
@@ -42,9 +41,3 @@ class GetDictDataDetail(DictDataSchemaBase):
     id: int = Field(description='字典数据 ID')
     created_time: datetime = Field(description='创建时间')
     updated_time: datetime | None = Field(None, description='更新时间')
-
-
-class GetDictDataWithRelation(DictDataSchemaBase):
-    """字典数据关联详情"""
-
-    type: GetDictTypeDetail | None = Field(None, description='字典类型信息')

backend/plugin/dict/service/dict_data_service.py

@@ -24,7 +24,7 @@ async def get(*, pk: int) -> DictData:
         :return:
         """
         async with async_db_session() as db:
-            dict_data = await dict_data_dao.get_with_relation(db, pk)
+            dict_data = await dict_data_dao.get(db, pk)
             if not dict_data:
                 raise errors.NotFoundError(msg='字典数据不存在')
             return dict_data
@@ -36,16 +36,17 @@ async def get_all() -> Sequence[DictData]:
             return dict_datas
 
     @staticmethod
-    async def get_select(*, label: str | None, value: str | None, status: int | None) -> Select:
+    async def get_select(*, label: str | None, value: str | None, status: int | None, type_id: int | None) -> Select:
         """
         获取字典数据列表查询条件
 
         :param label: 字典数据标签
         :param value: 字典数据键值
         :param status: 状态
+        :param type_id: 字典类型 ID
         :return:
         """
-        return await dict_data_dao.get_list(label=label, value=value, status=status)
+        return await dict_data_dao.get_list(label=label, value=value, status=status, type_id=type_id)
 
     @staticmethod
     async def create(*, obj: CreateDictDataParam) -> None: