diff --git a/ruoyi-fastapi-backend/module_admin/controller/info_controller.py b/ruoyi-fastapi-backend/module_admin/controller/info_controller.py index eef450a..d95921d 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/info_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/info_controller.py @@ -9,7 +9,7 @@ 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.info_service import InfoService -from module_admin.entity.vo.info_vo import DeleteInfoModel, InfoModel, InfoPageQueryModel +from module_admin.entity.vo.info_vo import DeleteInfoModel, InfoModel, InfoPageQueryModel, InfoUpdateModel from utils.common_util import bytes2file_response from utils.log_util import logger from utils.page_util import PageResponseModel @@ -62,14 +62,14 @@ async def add_system_info( return ResponseUtil.success(msg=add_info_result.message) -@infoController.put('' +@infoController.put('/edit_robot' # , dependencies=[Depends(CheckUserInterfaceAuth('robot:info:edit'))] ) @ValidateFields(validate_model='edit_info') @Log(title='机器人信息', business_type=BusinessType.UPDATE) async def edit_system_info( request: Request, - edit_info: InfoModel, + edit_info: InfoUpdateModel, query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user), ): diff --git a/ruoyi-fastapi-backend/module_admin/entity/vo/info_vo.py b/ruoyi-fastapi-backend/module_admin/entity/vo/info_vo.py index 6ca3f37..95810ff 100644 --- a/ruoyi-fastapi-backend/module_admin/entity/vo/info_vo.py +++ b/ruoyi-fastapi-backend/module_admin/entity/vo/info_vo.py @@ -66,6 +66,25 @@ class InfoPageQueryModel(InfoQueryModel): page_size: int = Field(default=10, description='每页记录数') +class InfoUpdateModel(BaseModel): + """ + 更新机器人信息模型 + """ + + model_config = ConfigDict(alias_generator=to_camel, from_attributes=True) + + robot_id: Optional[int] = Field(default=None, description='机器人ID') + + name: Optional[str] = Field(default=None, description='机器人名称') + model: Optional[str] = Field(default=None, description='机器人型号') + serial: Optional[str] = Field(default=None, description='序列号') + position: Optional[str] = Field(default=None, description='位置') + image: Optional[str] = Field(default=None, description='机器人外观图地址') + remark: Optional[str] = Field(default=None, description='备注') + update_time: Optional[datetime] = Field(default=None, description='修改时间') + update_by: Optional[str] = Field(default=None, description='修改者') + + class DeleteInfoModel(BaseModel): """ 删除机器人信息模型 diff --git a/ruoyi-fastapi-backend/module_admin/service/info_service.py b/ruoyi-fastapi-backend/module_admin/service/info_service.py index 5756182..7a6fddc 100644 --- a/ruoyi-fastapi-backend/module_admin/service/info_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/info_service.py @@ -4,7 +4,7 @@ from config.constant import CommonConstant from exceptions.exception import ServiceException from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.dao.info_dao import InfoDao -from module_admin.entity.vo.info_vo import DeleteInfoModel, InfoModel, InfoPageQueryModel +from module_admin.entity.vo.info_vo import DeleteInfoModel, InfoModel, InfoPageQueryModel, InfoUpdateModel from utils.common_util import CamelCaseUtil from utils.excel_util import ExcelUtil @@ -49,7 +49,7 @@ class InfoService: raise e @classmethod - async def edit_info_services(cls, query_db: AsyncSession, page_object: InfoModel): + async def edit_info_services(cls, query_db: AsyncSession, page_object: InfoUpdateModel): """ 编辑机器人信息信息service