diff --git a/ruoyi-fastapi-backend/module_admin/controller/explanation_content_controller.py b/ruoyi-fastapi-backend/module_admin/controller/explanation_content_controller.py index 8b22d18..bade870 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/explanation_content_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/explanation_content_controller.py @@ -6,7 +6,10 @@ from config.enums import BusinessType from config.get_db import get_db from module_admin.annotation.log_annotation import Log from module_admin.aspect.interface_auth import CheckUserInterfaceAuth +from module_admin.entity.vo.explanation_content_type_vo import Explanation_content_typePageQueryModel, \ + Explanation_content_typeQueryModel from module_admin.entity.vo.user_vo import CurrentUserModel +from module_admin.service.explanation_content_type_service import Explanation_content_typeService from module_admin.service.login_service import LoginService from module_admin.service.explanation_content_service import Explanation_contentService from module_admin.entity.vo.explanation_content_vo import DeleteExplanation_contentModel, Explanation_contentModel, Explanation_contentPageQueryModel @@ -91,14 +94,33 @@ async def delete_system_explanation_content(request: Request, explanation_conten @explanationContentController.get( - '/{explanation_content_id}', response_model=Explanation_contentModel - # , dependencies=[Depends(CheckUserInterfaceAuth('system:explanation_content:query'))] + '/type_list', response_model=PageResponseModel + # , dependencies=[Depends(CheckUserInterfaceAuth('system:explanation_content_type:list'))] ) -async def query_detail_system_explanation_content(request: Request, explanation_content_id: int, query_db: AsyncSession = Depends(get_db)): - explanation_content_detail_result = await Explanation_contentService.explanation_content_detail_services(query_db, explanation_content_id) - logger.info(f'获取explanation_content_id为{explanation_content_id}的信息成功') +async def get_system_explanation_content_type_list( + request: Request, +# explanation_content_type_page_query: Explanation_content_typePageQueryModel = Depends(Explanation_content_typePageQueryModel.as_query), + query_db: AsyncSession = Depends(get_db), +): + # 获取分页数据 + # explanation_content_type_page_query_result = await Explanation_content_typeService.get_explanation_content_type_list_services(query_db, explanation_content_type_page_query, is_page=True) - return ResponseUtil.success(data=explanation_content_detail_result) + explanation_content_type_query_result = await Explanation_content_typeService.get_explanation_content_type_list_services(query_db, Explanation_content_typeQueryModel(), is_page=False) + + logger.info('获取成功') + + return ResponseUtil.success(data=explanation_content_type_query_result) + + +# @explanationContentController.get( +# '/{explanation_content_id}', response_model=Explanation_contentModel +# # , dependencies=[Depends(CheckUserInterfaceAuth('system:explanation_content:query'))] +# ) +# async def query_detail_system_explanation_content(request: Request, explanation_content_id: int, query_db: AsyncSession = Depends(get_db)): +# explanation_content_detail_result = await Explanation_contentService.explanation_content_detail_services(query_db, explanation_content_id) +# logger.info(f'获取explanation_content_id为{explanation_content_id}的信息成功') +# +# return ResponseUtil.success(data=explanation_content_detail_result) # @explanationContentController.post('/export'