From 106a7417ff710f179484e7a59eb798ab63489cbc Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Mon, 25 Aug 2025 17:09:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=87=E6=8D=A2=E9=A3=8E?= =?UTF-8?q?=E6=A0=BC=E6=8E=A5=E5=8F=A3,=20=E6=B7=BB=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0robot=5Frole=5Fid,=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9B=B4=E6=96=B0=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...explanation_style_robot_pair_controller.py | 28 +++++++++---------- .../dao/explanation_style_robot_pair_dao.py | 14 +++++++++- .../vo/explanation_style_robot_pair_vo.py | 1 + .../explanation_style_robot_pair_service.py | 4 +-- .../service/robot_role_pairing_service.py | 2 ++ 5 files changed, 32 insertions(+), 17 deletions(-) diff --git a/ruoyi-fastapi-backend/module_admin/controller/explanation_style_robot_pair_controller.py b/ruoyi-fastapi-backend/module_admin/controller/explanation_style_robot_pair_controller.py index 04b14aa..7356a51 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/explanation_style_robot_pair_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/explanation_style_robot_pair_controller.py @@ -20,22 +20,22 @@ from utils.response_util import ResponseUtil explanation_style_robot_pairController = APIRouter(prefix='/system/explanation_style_robot_pair', dependencies=[Depends(LoginService.get_current_user)]) -@explanation_style_robot_pairController.get( - '/list', response_model=PageResponseModel, dependencies=[Depends(CheckUserInterfaceAuth('system:explanation_style_robot_pair:list'))] -) -async def get_system_explanation_style_robot_pair_list( - request: Request, - robot_id: int, - # explanation_style_robot_pair_page_query: Explanation_style_robot_pairPageQueryModel = Depends(Explanation_style_robot_pairPageQueryModel.as_query), - query_db: AsyncSession = Depends(get_db), -): - # 获取分页数据 - # explanation_style_robot_pair_page_query_result = await Explanation_style_robot_pairService.get_explanation_style_robot_pair_list_services(query_db, explanation_style_robot_pair_page_query, is_page=False) +# @explanation_style_robot_pairController.get( +# '/list', response_model=PageResponseModel, dependencies=[Depends(CheckUserInterfaceAuth('system:explanation_style_robot_pair:list'))] +# ) +# async def get_system_explanation_style_robot_pair_list( +# request: Request, +# robot_id: int, +# # explanation_style_robot_pair_page_query: Explanation_style_robot_pairPageQueryModel = Depends(Explanation_style_robot_pairPageQueryModel.as_query), +# query_db: AsyncSession = Depends(get_db), +# ): +# # 获取分页数据 +# # explanation_style_robot_pair_page_query_result = await Explanation_style_robot_pairService.get_explanation_style_robot_pair_list_services(query_db, explanation_style_robot_pair_page_query, is_page=False) - explanation_style_robot_pair_query_result = await Explanation_style_robot_pairService.get_style_robot_pair_list_services(query_db, robot_id) - logger.info('获取成功') +# explanation_style_robot_pair_query_result = await Explanation_style_robot_pairService.get_style_robot_pair_list_services(query_db, robot_id) +# logger.info('获取成功') - return ResponseUtil.success(data=explanation_style_robot_pair_query_result) +# return ResponseUtil.success(data=explanation_style_robot_pair_query_result) # 切换风格 @explanation_style_robot_pairController.post('/switch_style') diff --git a/ruoyi-fastapi-backend/module_admin/dao/explanation_style_robot_pair_dao.py b/ruoyi-fastapi-backend/module_admin/dao/explanation_style_robot_pair_dao.py index acc3f40..6759194 100644 --- a/ruoyi-fastapi-backend/module_admin/dao/explanation_style_robot_pair_dao.py +++ b/ruoyi-fastapi-backend/module_admin/dao/explanation_style_robot_pair_dao.py @@ -17,6 +17,16 @@ class Explanation_style_robot_pairDao: @classmethod async def get_robot_role_style(cls, db: AsyncSession, robot_id: int, role_id: int): + """根据机器人id和角色id获取机器人角色样式 + + Args: + db (AsyncSession): 数据库会话 + robot_id (int): 机器人id + role_id (int): 角色id + + Returns: + _type_: _description_ + """ stmt = ( select(ExplanationStyleRobotPairing.pairing_id, ExplanationStyleRobotPairing.explanation_style_id, ExplanationStyle.name, ExplanationStyle.detail, ExplanationStyleRobotPairing.status) @@ -31,7 +41,7 @@ class Explanation_style_robot_pairDao: @classmethod - async def switch_explanation_style(cls, db: AsyncSession, robot_id: int = None, pairing_id: int = None, status:str = '0', update_by: str = None): + async def switch_explanation_style(cls, db: AsyncSession, robot_id: int = None, pairing_id: int = None, robot_role_id: str = None ,status:str = '0', update_by: str = None): condition = list() @@ -39,6 +49,8 @@ class Explanation_style_robot_pairDao: condition.append(ExplanationStyleRobotPairing.robot_id == robot_id) if pairing_id: condition.append(ExplanationStyleRobotPairing.pairing_id == pairing_id) + if robot_role_id: + condition.append(ExplanationStyleRobotPairing.robot_role_id == robot_role_id) query = ( update(ExplanationStyleRobotPairing) diff --git a/ruoyi-fastapi-backend/module_admin/entity/vo/explanation_style_robot_pair_vo.py b/ruoyi-fastapi-backend/module_admin/entity/vo/explanation_style_robot_pair_vo.py index 5e3062e..2c74bd2 100644 --- a/ruoyi-fastapi-backend/module_admin/entity/vo/explanation_style_robot_pair_vo.py +++ b/ruoyi-fastapi-backend/module_admin/entity/vo/explanation_style_robot_pair_vo.py @@ -12,6 +12,7 @@ class SwitchExplanationStyleModel(BaseModel): pairing_id: int = Field(default=None, description='主键ID') robot_id: int = Field(default=None, description='机器人ID（关联robot_info表）') + robot_role_id: int = Field(default=None, description='机器人角色ID（关联robot_role表）') update_by: Optional[str] = Field(default=None, description='修改者') diff --git a/ruoyi-fastapi-backend/module_admin/service/explanation_style_robot_pair_service.py b/ruoyi-fastapi-backend/module_admin/service/explanation_style_robot_pair_service.py index 1e012fe..aefc13e 100644 --- a/ruoyi-fastapi-backend/module_admin/service/explanation_style_robot_pair_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/explanation_style_robot_pair_service.py @@ -19,9 +19,9 @@ class Explanation_style_robot_pairService: async def switch_explanation_style_services(cls, query_db: AsyncSession, switch_explanation_style: SwitchExplanationStyleModel): try: # 现将所有风格都置为0 - result1 = await Explanation_style_robot_pairDao.switch_explanation_style(query_db, switch_explanation_style.robot_id, None, "0", switch_explanation_style.update_by) + result1 = await Explanation_style_robot_pairDao.switch_explanation_style(query_db, switch_explanation_style.robot_id, None, switch_explanation_style.robot_role_id ,"0", switch_explanation_style.update_by) # 再将选择的风格置为1 - result2 = await Explanation_style_robot_pairDao.switch_explanation_style(query_db, None, switch_explanation_style.pairing_id, "1", switch_explanation_style.update_by) + result2 = await Explanation_style_robot_pairDao.switch_explanation_style(query_db, None, switch_explanation_style.pairing_id,None ,"1", switch_explanation_style.update_by) count = result2.rowcount await query_db.commit() 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 c98f87a..2e5a5df 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 @@ -36,9 +36,11 @@ class PairingService: pairing_list = await PairingDao.get_role_pairing_list(query_db, robot_id) style = None + # print(pairing_list) for pairing in pairing_list: if pairing["status"] == '1': + # print(pairing) style = await Explanation_style_robot_pairDao.get_robot_role_style(query_db, robot_id, pairing["robot_role_id"])