diff --git a/ruoyi-fastapi-backend/module_admin/controller/door_controller.py b/ruoyi-fastapi-backend/module_admin/controller/door_controller.py index 5232663..35cdebe 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/door_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/door_controller.py @@ -22,6 +22,12 @@ import time doorController = APIRouter(prefix='/system/door', dependencies=[Depends(LoginService.get_current_user)]) +""" + 实时监控页面权限 access:monitor:view ,dependencies=[Depends(CheckUserInterfaceAuth('access:monitor:view'))] + 识别记录表权限 access:record:list , dependencies=[Depends(CheckUserInterfaceAuth('access:record:list'))] + 门禁设备管理 access:device:list, dependencies=[Depends(CheckUserInterfaceAuth('access:device:list'))] +""" + # 机器人控制开门 @doorController.post('/control_door') async def control_door(request: Request, door_index_code: str = Body(), control_type: int = Body()): @@ -108,7 +114,7 @@ async def delete_system_door(request: Request, ids: str, query_db: AsyncSession return ResponseUtil.success(msg=delete_door_result.message) # 获取设备状态 -@doorController.get('/door_status',) +@doorController.get('/door_status', dependencies=[Depends(CheckUserInterfaceAuth('access:monitor:view'))]) async def get_door_status(request: Request, query_db: AsyncSession = Depends(get_db)): result = await DoorService.get_door_status_service(query_db) @@ -118,7 +124,7 @@ async def get_door_status(request: Request, query_db: AsyncSession = Depends(get return ResponseUtil.error(msg=result[1]) # 获取视频流地址 -@doorController.get('/video_uri/{robot_id}') +@doorController.get('/video_uri/{robot_id}' ,dependencies=[Depends(CheckUserInterfaceAuth('access:monitor:view'))]) async def get_video_uri(request: Request , robot_id: int , query_db: AsyncSession = Depends(get_db) 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 bade870..8be8163 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/explanation_content_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/explanation_content_controller.py @@ -33,10 +33,10 @@ explanation_content_page_query: Explanation_contentPageQueryModel = Depends(Expl query_db: AsyncSession = Depends(get_db), ): # 获取分页数据 - explanation_content_page_query_result = await Explanation_contentService.get_explanation_content_list_services(query_db, explanation_content_page_query, is_page=True) + explanation_content_page_query_result = await Explanation_contentService.get_explanation_content_list_services(query_db, explanation_content_page_query, is_page=False) logger.info('获取成功') - return ResponseUtil.success(model_content=explanation_content_page_query_result) + return ResponseUtil.success(data=explanation_content_page_query_result) @explanationContentController.post('/add_explanation' diff --git a/ruoyi-fastapi-backend/module_admin/controller/ragflow_controller.py b/ruoyi-fastapi-backend/module_admin/controller/ragflow_controller.py index bd21e10..3de9439 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/ragflow_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/ragflow_controller.py @@ -180,7 +180,6 @@ async def update_chat_assistant( """ 更新聊天助手 """ - result = await RAGFlowService.update_chat_assistant_services(update_params) return parse_result(result)