From 4c61562a910c5e0ef62a7dea7fac18b9cebb7394 Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Fri, 1 Aug 2025 14:08:29 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=80=E9=94=AE=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=9C=AA=E5=A4=84=E7=90=86=E7=9A=84=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/message_controller.py | 21 ++++++++++++------- .../module_admin/service/message_service.py | 13 ++++++++++-- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/ruoyi-fastapi-backend/module_admin/controller/message_controller.py b/ruoyi-fastapi-backend/module_admin/controller/message_controller.py index 88ffb8e..4b22d75 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/message_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/message_controller.py @@ -20,6 +20,16 @@ from utils.response_util import ResponseUtil messageController = APIRouter(prefix='/system/message', dependencies=[Depends(LoginService.get_current_user)]) +# 查看告警类型分布 +@messageController.get( + '/alarm_type_distribution' +) +async def get_alarm_type_distribution( + request: Request, + query_db: AsyncSession = Depends(get_db), +): + pass + # 一键处理未处理的告警消息 @messageController.get( @@ -28,13 +38,10 @@ messageController = APIRouter(prefix='/system/message', dependencies=[Depends(Lo async def handle_all_message( query_db: AsyncSession = Depends(get_db), ): - try: - await MessageService.handle_all_message_services(query_db) - await query_db.commit() - return CrudResponseModel(is_success=True, message='处理成功') - except Exception as e: - await query_db.rollback() - raise e + + result = await MessageService.handle_all_message_services(query_db) + return CrudResponseModel.success(msg= result.message) + # 查询告警数量信息 @messageController.get( diff --git a/ruoyi-fastapi-backend/module_admin/service/message_service.py b/ruoyi-fastapi-backend/module_admin/service/message_service.py index 0a0fc35..b83d5a9 100644 --- a/ruoyi-fastapi-backend/module_admin/service/message_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/message_service.py @@ -15,8 +15,17 @@ class MessageService: """ @classmethod - async def handle_all_message_services(cls,db: AsyncSession): - return await MessageDao.handle_all_message(db) + async def handle_all_message_services(cls,query_db: AsyncSession): + + try: + await MessageDao.handle_all_message(query_db) + await query_db.commit() + return CrudResponseModel(is_success=True, message='处理成功') + except Exception as e: + await query_db.rollback() + raise e + + @classmethod async def get_message_list_services(