From 4093c78a531ec9807bb4aedb1be8e95660c7c855 Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Wed, 30 Jul 2025 14:57:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E6=9C=BA=E5=99=A8=E4=BA=BA?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=AE=9E=E4=BD=93=E7=B1=BB=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/robot_role_controller.py | 110 +++++++++++++++ .../module_admin/dao/robot_role_dao.py | 131 +++++++++++++++++ .../module_admin/entity/do/robot_role_do.py | 22 +++ .../module_admin/entity/vo/robot_role_vo.py | 84 +++++++++++ .../service/robot_role_service.py | 133 ++++++++++++++++++ 5 files changed, 480 insertions(+) create mode 100644 ruoyi-fastapi-backend/module_admin/controller/robot_role_controller.py create mode 100644 ruoyi-fastapi-backend/module_admin/dao/robot_role_dao.py create mode 100644 ruoyi-fastapi-backend/module_admin/entity/do/robot_role_do.py create mode 100644 ruoyi-fastapi-backend/module_admin/entity/vo/robot_role_vo.py create mode 100644 ruoyi-fastapi-backend/module_admin/service/robot_role_service.py diff --git a/ruoyi-fastapi-backend/module_admin/controller/robot_role_controller.py b/ruoyi-fastapi-backend/module_admin/controller/robot_role_controller.py new file mode 100644 index 0000000..2fd2d74 --- /dev/null +++ b/ruoyi-fastapi-backend/module_admin/controller/robot_role_controller.py @@ -0,0 +1,110 @@ +from datetime import datetime +from fastapi import APIRouter, Depends, Form, Request +from pydantic_validation_decorator import ValidateFields +from sqlalchemy.ext.asyncio import AsyncSession +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.user_vo import CurrentUserModel +from module_admin.service.login_service import LoginService +from module_admin.service.role_service import RoleService +from module_admin.entity.vo.role_vo import DeleteRoleModel, RoleModel, RolePageQueryModel +from utils.common_util import bytes2file_response +from utils.log_util import logger +from utils.page_util import PageResponseModel +from utils.response_util import ResponseUtil + + +""" + 当前用不到这个接口 +""" + + +# roleController = APIRouter(prefix='/system/role', dependencies=[Depends(LoginService.get_current_user)]) +# +# +# @roleController.get( +# '/list', response_model=PageResponseModel, dependencies=[Depends(CheckUserInterfaceAuth('system:role:list'))] +# ) +# async def get_system_role_list( +# request: Request, +# role_page_query: RolePageQueryModel = Depends(RolePageQueryModel.as_query), +# query_db: AsyncSession = Depends(get_db), +# ): +# # 获取分页数据 +# role_page_query_result = await RoleService.get_role_list_services(query_db, role_page_query, is_page=True) +# logger.info('获取成功') +# +# return ResponseUtil.success(model_content=role_page_query_result) + + +# @roleController.post('', dependencies=[Depends(CheckUserInterfaceAuth('system:role:add'))]) +# @ValidateFields(validate_model='add_role') +# @Log(title='系统角色', business_type=BusinessType.INSERT) +# async def add_system_role( +# request: Request, +# add_role: RoleModel, +# query_db: AsyncSession = Depends(get_db), +# current_user: CurrentUserModel = Depends(LoginService.get_current_user), +# ): +# add_role.create_time = datetime.now() +# add_role.create_by = current_user.user.user_name +# add_role.update_time = datetime.now() +# add_role.update_by = current_user.user.user_name +# add_role_result = await RoleService.add_role_services(query_db, add_role) +# logger.info(add_role_result.message) +# +# return ResponseUtil.success(msg=add_role_result.message) + + +# @roleController.put('', dependencies=[Depends(CheckUserInterfaceAuth('system:role:edit'))]) +# @ValidateFields(validate_model='edit_role') +# @Log(title='系统角色', business_type=BusinessType.UPDATE) +# async def edit_system_role( +# request: Request, +# edit_role: RoleModel, +# query_db: AsyncSession = Depends(get_db), +# current_user: CurrentUserModel = Depends(LoginService.get_current_user), +# ): +# edit_role.update_by = current_user.user.user_name +# edit_role.update_time = datetime.now() +# edit_role_result = await RoleService.edit_role_services(query_db, edit_role) +# logger.info(edit_role_result.message) +# +# return ResponseUtil.success(msg=edit_role_result.message) + + +# @roleController.delete('/{robot_role_ids}', dependencies=[Depends(CheckUserInterfaceAuth('system:role:remove'))]) +# @Log(title='系统角色', business_type=BusinessType.DELETE) +# async def delete_system_role(request: Request, robot_role_ids: str, query_db: AsyncSession = Depends(get_db)): +# delete_role = DeleteRoleModel(robotRoleIds=robot_role_ids) +# delete_role_result = await RoleService.delete_role_services(query_db, delete_role) +# logger.info(delete_role_result.message) +# +# return ResponseUtil.success(msg=delete_role_result.message) + + +# @roleController.get( +# '/{robot_role_id}', response_model=RoleModel, dependencies=[Depends(CheckUserInterfaceAuth('system:role:query'))] +# ) +# async def query_detail_system_role(request: Request, robot_role_id: int, query_db: AsyncSession = Depends(get_db)): +# role_detail_result = await RoleService.role_detail_services(query_db, robot_role_id) +# logger.info(f'获取robot_role_id为{robot_role_id}的信息成功') +# +# return ResponseUtil.success(data=role_detail_result) + + +# @roleController.post('/export', dependencies=[Depends(CheckUserInterfaceAuth('system:role:export'))]) +# @Log(title='系统角色', business_type=BusinessType.EXPORT) +# async def export_system_role_list( +# request: Request, +# role_page_query: RolePageQueryModel = Form(), +# query_db: AsyncSession = Depends(get_db), +# ): +# # 获取全量数据 +# role_query_result = await RoleService.get_role_list_services(query_db, role_page_query, is_page=False) +# role_export_result = await RoleService.export_role_list_services(role_query_result) +# logger.info('导出成功') +# +# return ResponseUtil.streaming(data=bytes2file_response(role_export_result)) diff --git a/ruoyi-fastapi-backend/module_admin/dao/robot_role_dao.py b/ruoyi-fastapi-backend/module_admin/dao/robot_role_dao.py new file mode 100644 index 0000000..a9de2ab --- /dev/null +++ b/ruoyi-fastapi-backend/module_admin/dao/robot_role_dao.py @@ -0,0 +1,131 @@ +from datetime import datetime, time +from sqlalchemy import delete, select, update +from sqlalchemy.ext.asyncio import AsyncSession +from module_admin.entity.do.role_do import RobotRole +from module_admin.entity.vo.role_vo import RoleModel, RolePageQueryModel +from utils.page_util import PageUtil + + +class RoleDao: + """ + 系统角色模块数据库操作层 + """ + + @classmethod + async def get_role_detail_by_id(cls, db: AsyncSession, robot_role_id: int): + """ + 根据机器人角色ID获取系统角色详细信息 + + :param db: orm对象 + :param robot_role_id: 机器人角色ID + :return: 系统角色信息对象 + """ + role_info = ( + ( + await db.execute( + select(RobotRole) + .where( + RobotRole.robot_role_id == robot_role_id + ) + ) + ) + .scalars() + .first() + ) + + return role_info + + @classmethod + async def get_role_detail_by_info(cls, db: AsyncSession, role: RoleModel): + """ + 根据系统角色参数获取系统角色信息 + + :param db: orm对象 + :param role: 系统角色参数对象 + :return: 系统角色信息对象 + """ + role_info = ( + ( + await db.execute( + select(RobotRole).where( + ) + ) + ) + .scalars() + .first() + ) + + return role_info + + @classmethod + async def get_role_list(cls, db: AsyncSession, query_object: RolePageQueryModel, is_page: bool = False): + """ + 根据查询参数获取系统角色列表信息 + + :param db: orm对象 + :param query_object: 查询参数对象 + :param is_page: 是否开启分页 + :return: 系统角色列表信息对象 + """ + query = ( + select(RobotRole) + .where( + RobotRole.rolename.like(f'%{query_object.rolename}%') if query_object.rolename else True, + RobotRole.detail == query_object.detail if query_object.detail else True, + RobotRole.create_time.between( + datetime.combine(datetime.strptime(query_object.begin_create_time, '%Y-%m-%d'), time(00, 00, 00)), + datetime.combine(datetime.strptime(query_object.end_create_time, '%Y-%m-%d'), time(23, 59, 59)), + ) + if query_object.begin_create_time and query_object.end_create_time + else True, + RobotRole.update_time.between( + datetime.combine(datetime.strptime(query_object.begin_update_time, '%Y-%m-%d'), time(00, 00, 00)), + datetime.combine(datetime.strptime(query_object.end_update_time, '%Y-%m-%d'), time(23, 59, 59)), + ) + if query_object.begin_update_time and query_object.end_update_time + else True, + ) + .order_by(RobotRole.robot_role_id) + .distinct() + ) + role_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) + + return role_list + + @classmethod + async def add_role_dao(cls, db: AsyncSession, role: RoleModel): + """ + 新增系统角色数据库操作 + + :param db: orm对象 + :param role: 系统角色对象 + :return: + """ + db_role = RobotRole(**role.model_dump(exclude={})) + db.add(db_role) + await db.flush() + + return db_role + + @classmethod + async def edit_role_dao(cls, db: AsyncSession, role: dict): + """ + 编辑系统角色数据库操作 + + :param db: orm对象 + :param role: 需要更新的系统角色字典 + :return: + """ + await db.execute(update(RobotRole), [role]) + + @classmethod + async def delete_role_dao(cls, db: AsyncSession, role: RoleModel): + """ + 删除系统角色数据库操作 + + :param db: orm对象 + :param role: 系统角色对象 + :return: + """ + await db.execute(delete(RobotRole).where(RobotRole.robot_role_id.in_([role.robot_role_id]))) + diff --git a/ruoyi-fastapi-backend/module_admin/entity/do/robot_role_do.py b/ruoyi-fastapi-backend/module_admin/entity/do/robot_role_do.py new file mode 100644 index 0000000..eac1af0 --- /dev/null +++ b/ruoyi-fastapi-backend/module_admin/entity/do/robot_role_do.py @@ -0,0 +1,22 @@ +from sqlalchemy import BigInteger, String, Column, DateTime +from config.database import Base + + +class RobotRole(Base): + """ + 系统角色表 + """ + + __tablename__ = 'robot_role' + + robot_role_id = Column(BigInteger, primary_key=True, autoincrement=True, nullable=False, comment='机器人角色ID') + rolename = Column(String(32), nullable=False, comment='角色名称') + detail = Column(String(512), nullable=True, comment='角色介绍') + create_time = Column(DateTime, nullable=False, comment='创建时间') + create_by = Column(String(64), nullable=False, comment='创建者') + update_time = Column(DateTime, nullable=False, comment='修改时间') + update_by = Column(String(64), nullable=False, comment='修改者') + remark = Column(String(512), nullable=True, comment='备注') + + + diff --git a/ruoyi-fastapi-backend/module_admin/entity/vo/robot_role_vo.py b/ruoyi-fastapi-backend/module_admin/entity/vo/robot_role_vo.py new file mode 100644 index 0000000..30317e1 --- /dev/null +++ b/ruoyi-fastapi-backend/module_admin/entity/vo/robot_role_vo.py @@ -0,0 +1,84 @@ +from datetime import datetime +from pydantic import BaseModel, ConfigDict, Field +from pydantic.alias_generators import to_camel +from pydantic_validation_decorator import NotBlank +from typing import Optional +from module_admin.annotation.pydantic_annotation import as_query + + + + +class RoleModel(BaseModel): + """ + 系统角色表对应pydantic模型 + """ + model_config = ConfigDict(alias_generator=to_camel, from_attributes=True) + + robot_role_id: Optional[int] = Field(default=None, description='机器人角色ID') + rolename: Optional[str] = Field(default=None, description='角色名称') + detail: Optional[str] = Field(default=None, description='角色介绍') + create_time: Optional[datetime] = Field(default=None, description='创建时间') + create_by: Optional[str] = Field(default=None, description='创建者') + update_time: Optional[datetime] = Field(default=None, description='修改时间') + update_by: Optional[str] = Field(default=None, description='修改者') + remark: Optional[str] = Field(default=None, description='备注') + + @NotBlank(field_name='rolename', message='角色名称不能为空') + def get_rolename(self): + return self.rolename + + @NotBlank(field_name='create_time', message='创建时间不能为空') + def get_create_time(self): + return self.create_time + + @NotBlank(field_name='create_by', message='创建者不能为空') + def get_create_by(self): + return self.create_by + + @NotBlank(field_name='update_time', message='修改时间不能为空') + def get_update_time(self): + return self.update_time + + @NotBlank(field_name='update_by', message='修改者不能为空') + def get_update_by(self): + return self.update_by + + + def validate_fields(self): + self.get_rolename() + self.get_create_time() + self.get_create_by() + self.get_update_time() + self.get_update_by() + + + + +class RoleQueryModel(RoleModel): + """ + 系统角色不分页查询模型 + """ + begin_create_time: Optional[str] = Field(default=None, description='开始创建时间') + end_create_time: Optional[str] = Field(default=None, description='结束创建时间') + begin_update_time: Optional[str] = Field(default=None, description='开始修改时间') + end_update_time: Optional[str] = Field(default=None, description='结束修改时间') + + +@as_query +class RolePageQueryModel(RoleQueryModel): + """ + 系统角色分页查询模型 + """ + + page_num: int = Field(default=1, description='当前页码') + page_size: int = Field(default=10, description='每页记录数') + + +class DeleteRoleModel(BaseModel): + """ + 删除系统角色模型 + """ + + model_config = ConfigDict(alias_generator=to_camel) + + robot_role_ids: str = Field(description='需要删除的机器人角色ID') diff --git a/ruoyi-fastapi-backend/module_admin/service/robot_role_service.py b/ruoyi-fastapi-backend/module_admin/service/robot_role_service.py new file mode 100644 index 0000000..3f64aa6 --- /dev/null +++ b/ruoyi-fastapi-backend/module_admin/service/robot_role_service.py @@ -0,0 +1,133 @@ +from sqlalchemy.ext.asyncio import AsyncSession +from typing import List +from config.constant import CommonConstant +from exceptions.exception import ServiceException +from module_admin.entity.vo.common_vo import CrudResponseModel +from module_admin.dao.role_dao import RoleDao +from module_admin.entity.vo.role_vo import DeleteRoleModel, RoleModel, RolePageQueryModel +from utils.common_util import CamelCaseUtil +from utils.excel_util import ExcelUtil + + +class RoleService: + """ + 系统角色模块服务层 + """ + + @classmethod + async def get_role_list_services( + cls, query_db: AsyncSession, query_object: RolePageQueryModel, is_page: bool = False + ): + """ + 获取系统角色列表信息service + + :param query_db: orm对象 + :param query_object: 查询参数对象 + :param is_page: 是否开启分页 + :return: 系统角色列表信息对象 + """ + role_list_result = await RoleDao.get_role_list(query_db, query_object, is_page) + + return role_list_result + + + @classmethod + async def add_role_services(cls, query_db: AsyncSession, page_object: RoleModel): + """ + 新增系统角色信息service + + :param query_db: orm对象 + :param page_object: 新增系统角色对象 + :return: 新增系统角色校验结果 + """ + try: + await RoleDao.add_role_dao(query_db, page_object) + await query_db.commit() + return CrudResponseModel(is_success=True, message='新增成功') + except Exception as e: + await query_db.rollback() + raise e + + @classmethod + async def edit_role_services(cls, query_db: AsyncSession, page_object: RoleModel): + """ + 编辑系统角色信息service + + :param query_db: orm对象 + :param page_object: 编辑系统角色对象 + :return: 编辑系统角色校验结果 + """ + edit_role = page_object.model_dump(exclude_unset=True, exclude={'create_time', 'create_by', }) + role_info = await cls.role_detail_services(query_db, page_object.robot_role_id) + if role_info.robot_role_id: + try: + await RoleDao.edit_role_dao(query_db, edit_role) + await query_db.commit() + return CrudResponseModel(is_success=True, message='更新成功') + except Exception as e: + await query_db.rollback() + raise e + else: + raise ServiceException(message='系统角色不存在') + + @classmethod + async def delete_role_services(cls, query_db: AsyncSession, page_object: DeleteRoleModel): + """ + 删除系统角色信息service + + :param query_db: orm对象 + :param page_object: 删除系统角色对象 + :return: 删除系统角色校验结果 + """ + if page_object.robot_role_ids: + robot_role_id_list = page_object.robot_role_ids.split(',') + try: + for robot_role_id in robot_role_id_list: + await RoleDao.delete_role_dao(query_db, RoleModel(robotRoleId=robot_role_id)) + await query_db.commit() + return CrudResponseModel(is_success=True, message='删除成功') + except Exception as e: + await query_db.rollback() + raise e + else: + raise ServiceException(message='传入机器人角色ID为空') + + @classmethod + async def role_detail_services(cls, query_db: AsyncSession, robot_role_id: int): + """ + 获取系统角色详细信息service + + :param query_db: orm对象 + :param robot_role_id: 机器人角色ID + :return: 机器人角色ID对应的信息 + """ + role = await RoleDao.get_role_detail_by_id(query_db, robot_role_id=robot_role_id) + if role: + result = RoleModel(**CamelCaseUtil.transform_result(role)) + else: + result = RoleModel(**dict()) + + return result + + @staticmethod + async def export_role_list_services(role_list: List): + """ + 导出系统角色信息service + + :param role_list: 系统角色信息列表 + :return: 系统角色信息对应excel的二进制数据 + """ + # 创建一个映射字典，将英文键映射到中文键 + mapping_dict = { + 'robotRoleId': '机器人角色ID', + 'rolename': '角色名称', + 'detail': '角色介绍', + 'createTime': '创建时间', + 'createBy': '创建者', + 'updateTime': '修改时间', + 'updateBy': '修改者', + 'remark': '备注', + } + binary_data = ExcelUtil.export_list2excel(role_list, mapping_dict) + + return binary_data