From 707dd6bd833e6de2f41a02438a896f3b5a0d16ff Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Wed, 30 Jul 2025 11:23:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AE=9E=E7=8E=B0=E7=BC=96=E8=BE=91=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_admin/controller/message_controller.py | 6 +++--- .../module_admin/entity/vo/message_vo.py | 14 ++++++++++++++ .../module_admin/service/message_service.py | 4 ++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ruoyi-fastapi-backend/module_admin/controller/message_controller.py b/ruoyi-fastapi-backend/module_admin/controller/message_controller.py index e3f4591..b7c0118 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/message_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/message_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.message_service import MessageService -from module_admin.entity.vo.message_vo import DeleteMessageModel, MessageModel, MessagePageQueryModel +from module_admin.entity.vo.message_vo import DeleteMessageModel, MessageModel, MessagePageQueryModel, EditMessageModel from utils.common_util import bytes2file_response from utils.log_util import logger from utils.page_util import PageResponseModel @@ -58,14 +58,14 @@ async def add_system_message( return ResponseUtil.success(msg=add_message_result.message) -@messageController.put('' +@messageController.put('/edit_message' # , dependencies=[Depends(CheckUserInterfaceAuth('system:message:edit'))] ) @ValidateFields(validate_model='edit_message') @Log(title='系统消息', business_type=BusinessType.UPDATE) async def edit_system_message( request: Request, - edit_message: MessageModel, + edit_message: EditMessageModel, query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user), ): diff --git a/ruoyi-fastapi-backend/module_admin/entity/vo/message_vo.py b/ruoyi-fastapi-backend/module_admin/entity/vo/message_vo.py index a67a6c4..a677d52 100644 --- a/ruoyi-fastapi-backend/module_admin/entity/vo/message_vo.py +++ b/ruoyi-fastapi-backend/module_admin/entity/vo/message_vo.py @@ -68,6 +68,20 @@ class MessageQueryModel(BaseModel): begin_update_time: Optional[str] = Field(default=None, description='开始更新时间') end_update_time: Optional[str] = Field(default=None, description='结束更新时间') +# 编辑消息类 +class EditMessageModel(BaseModel): + """ + 系统消息编辑模型 + """ + model_config = ConfigDict(alias_generator=to_camel, from_attributes=True) + + message_id: int = Field(default=None, description='消息主键') + status: Optional[str] = Field(default=None, description='状态(0未处理,1已处理)') + remark: Optional[str] = Field(default=None, description='备注') + update_time: Optional[datetime] = Field(default=None, description='更新时间') + update_by: Optional[str] = Field(default=None, description='更新者') + + @as_query class MessagePageQueryModel(MessageQueryModel): diff --git a/ruoyi-fastapi-backend/module_admin/service/message_service.py b/ruoyi-fastapi-backend/module_admin/service/message_service.py index d5fdb9d..3531537 100644 --- a/ruoyi-fastapi-backend/module_admin/service/message_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/message_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.message_dao import MessageDao -from module_admin.entity.vo.message_vo import DeleteMessageModel, MessageModel, MessagePageQueryModel +from module_admin.entity.vo.message_vo import DeleteMessageModel, MessageModel, MessagePageQueryModel, EditMessageModel from utils.common_util import CamelCaseUtil from utils.excel_util import ExcelUtil @@ -49,7 +49,7 @@ class MessageService: raise e @classmethod - async def edit_message_services(cls, query_db: AsyncSession, page_object: MessageModel): + async def edit_message_services(cls, query_db: AsyncSession, page_object: EditMessageModel): """ 编辑系统消息信息service