From 35fe932eda2700228b1f68f71a447cb3d3bef2c1 Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Tue, 16 Sep 2025 14:14:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=E6=9C=BA?= =?UTF-8?q?=E5=99=A8=E4=BA=BA=E8=A7=92=E8=89=B2=E6=8E=A5=E5=8F=A3v1,=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=89=80=E6=9C=89=E6=9C=BA=E5=99=A8=E4=BA=BA?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=92=8C=E9=A3=8E=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../robot_role_pairing_controller.py | 16 +++++++++ .../service/robot_role_pairing_service.py | 33 ++++++++++++++++--- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/ruoyi-fastapi-backend/module_admin/controller/robot_role_pairing_controller.py b/ruoyi-fastapi-backend/module_admin/controller/robot_role_pairing_controller.py index d1852cc..afadb26 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/robot_role_pairing_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/robot_role_pairing_controller.py @@ -35,6 +35,22 @@ async def get_system_role_pairing_list( return ResponseUtil.success(data={"role": pairing_list, "style":style}) +# 获取机器人角色新版 +@pairingController.get( + '/v1/{robot_id}', +) +async def get_system_role_pairing_list_v1( + request: Request, + robot_id: int, + query_db: AsyncSession = Depends(get_db), +): + + pairing_list, style = await PairingService.get_role_pairing_list_services_v1(query_db, robot_id) + + return ResponseUtil.success(data={"role": pairing_list, "style":style}) + + + @pairingController.post( '/change', ) diff --git a/ruoyi-fastapi-backend/module_admin/service/robot_role_pairing_service.py b/ruoyi-fastapi-backend/module_admin/service/robot_role_pairing_service.py index d828b8b..428f26d 100644 --- a/ruoyi-fastapi-backend/module_admin/service/robot_role_pairing_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/robot_role_pairing_service.py @@ -34,19 +34,43 @@ class PairingService: @classmethod async def get_role_pairing_list_services(cls, query_db: AsyncSession, robot_id: int): pairing_list = await PairingDao.get_role_pairing_list(query_db, robot_id) - + # style_list = list() style = None # print(pairing_list) for pairing in pairing_list: - + if pairing["status"] == '1': style = await Explanation_style_robot_pairDao.get_robot_role_style(query_db, robot_id, pairing["robot_role_id"]) # style_list.append(style) - - + return pairing_list, style + @classmethod + async def get_role_pairing_list_services_v1(cls, query_db: AsyncSession, robot_id: int) -> list: + """ 获取机器人角色对齐风格列表 + + Args: + query_db (AsyncSession): db + robot_id (int): 机器人id + + Returns: + list: 机器人角色风格对齐列表 + """ + + pairing_list = await PairingDao.get_role_pairing_list(query_db, robot_id) + + style_list = list() + + for pairing in pairing_list: + + style = await Explanation_style_robot_pairDao.get_robot_role_style( + query_db, robot_id, pairing["robot_role_id"] + ) + style_list.append(style) + + return pairing_list, style_list + @classmethod async def get_pairing_list_services( cls, query_db: AsyncSession, query_object: PairingPageQueryModel, is_page: bool = False @@ -63,7 +87,6 @@ class PairingService: return pairing_list_result - @classmethod async def add_pairing_services(cls, query_db: AsyncSession, page_object: PairingModel): """