diff --git a/ruoyi-fastapi-backend/module_admin/dao/message_dao.py b/ruoyi-fastapi-backend/module_admin/dao/message_dao.py index 1f9167d..94363ce 100644 --- a/ruoyi-fastapi-backend/module_admin/dao/message_dao.py +++ b/ruoyi-fastapi-backend/module_admin/dao/message_dao.py @@ -3,6 +3,7 @@ from sqlalchemy.ext.asyncio import AsyncSession from module_admin.entity.do.message_do import Message from module_admin.entity.vo.message_vo import MessageModel, MessagePageQueryModel from utils.page_util import PageUtil +from datetime import datetime, time class MessageDao: @@ -71,7 +72,17 @@ class MessageDao: .where( Message.type == query_object.type if query_object.type else True, Message.status == query_object.status if query_object.status else True, - Message.detail == query_object.detail if query_object.detail else True, + # Message.detail == query_object.detail if query_object.detail else True, + Message.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, + Message.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(Message.message_id) .distinct() 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 28b85a4..c461cf9 100644 --- a/ruoyi-fastapi-backend/module_admin/entity/vo/message_vo.py +++ b/ruoyi-fastapi-backend/module_admin/entity/vo/message_vo.py @@ -53,10 +53,15 @@ class MessageModel(BaseModel): -class MessageQueryModel(MessageModel): +class MessageQueryModel(BaseModel): """ 系统消息不分页查询模型 """ + model_config = ConfigDict(alias_generator=to_camel, from_attributes=True) + + type: Optional[str] = Field(default=None, description='类型(0告警消息)') + status: Optional[str] = Field(default=None, description='状态(0未处理,1已处理)') + 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='开始更新时间')