启用sys_alert告警消息有关内容. 将告警消息集成到message中,作为一个消息类型

ruoyi-fastapi-backend/module_admin/controller/message_controller.py

@@ -40,7 +40,6 @@ async def get_alarm_type_distribution(
 async def handle_all_message(
     query_db: AsyncSession = Depends(get_db),
 ):
-
     result =  await MessageService.handle_all_message_services(query_db)
     return ResponseUtil.success(msg= result.message)
 
@@ -54,85 +53,99 @@ async def count_message(request: Request, query_db: AsyncSession = Depends(get_d
     count_message_result = await MessageService.count_message(query_db)
     return ResponseUtil.success(data = count_message_result)
 
-@messageController.get(
-    '/list', response_model=PageResponseModel
-    # , dependencies=[Depends(CheckUserInterfaceAuth('system:message:list'))]
-)
-async def get_system_message_list(
+
+
+# # 获取所有消息列表
+# @messageController.get(
+#     '/list', response_model=PageResponseModel
+#     # , dependencies=[Depends(CheckUserInterfaceAuth('system:message:list'))]
+# )
+# async def get_system_message_list(
+#     request: Request,
+#     message_page_query: MessagePageQueryModel = Depends(MessagePageQueryModel.as_query),
+#     query_db: AsyncSession = Depends(get_db),
+# ):
+#     # 获取分页数据
+#     message_page_query_result = await MessageService.get_message_list_services(query_db, message_page_query, is_page=True)
+#     logger.info('获取成功')
+
+#     return ResponseUtil.success(model_content=message_page_query_result)
+
+# 获取告警消息列表
+@messageController.get('/alert_message')
+async def get_alert_message(
     request: Request,
-message_page_query: MessagePageQueryModel = Depends(MessagePageQueryModel.as_query),
+    pageNum: int = 1,
+    pageSize: int = 10,
     query_db: AsyncSession = Depends(get_db),
 ):
-    # 获取分页数据
-    message_page_query_result = await MessageService.get_message_list_services(query_db, message_page_query, is_page=True)
-    logger.info('获取成功')
-
-    return ResponseUtil.success(model_content=message_page_query_result)
+    alert_message = await MessageService.get_alert_message_services(query_db, pageNum, pageSize)
+    return ResponseUtil.success(model_content=alert_message)
 
 
 # 该接口只做测试用, 并不对外开放
-@messageController.post('/add_message'
-    # , dependencies=[Depends(CheckUserInterfaceAuth('system:message:add'))]
-                        )
-@ValidateFields(validate_model='add_message')
-@Log(title='系统消息', business_type=BusinessType.INSERT)
-async def add_system_message(
-    request: Request,
-    add_message: MessageModel,
-    query_db: AsyncSession = Depends(get_db),
-    current_user: CurrentUserModel = Depends(LoginService.get_current_user),
-):
-    add_message.create_time = datetime.now()
-    add_message.create_by = current_user.user.user_name
-    add_message.update_time = datetime.now()
-    add_message.update_by = current_user.user.user_name
-    add_message.status = '0'
-    add_message_result = await MessageService.add_message_services(query_db, add_message)
-    logger.info(add_message_result.message)
+# @messageController.post('/add_message'
+#     # , dependencies=[Depends(CheckUserInterfaceAuth('system:message:add'))]
+#                         )
+# @ValidateFields(validate_model='add_message')
+# @Log(title='系统消息', business_type=BusinessType.INSERT)
+# async def add_system_message(
+#     request: Request,
+#     add_message: MessageModel,
+#     query_db: AsyncSession = Depends(get_db),
+#     current_user: CurrentUserModel = Depends(LoginService.get_current_user),
+# ):
+#     add_message.create_time = datetime.now()
+#     add_message.create_by = current_user.user.user_name
+#     add_message.update_time = datetime.now()
+#     add_message.update_by = current_user.user.user_name
+#     add_message.status = '0'
+#     add_message_result = await MessageService.add_message_services(query_db, add_message)
+#     logger.info(add_message_result.message)
 
-    return ResponseUtil.success(msg=add_message_result.message)
+#     return ResponseUtil.success(msg=add_message_result.message)
 
 
-@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: EditMessageModel,
-    query_db: AsyncSession = Depends(get_db),
-    current_user: CurrentUserModel = Depends(LoginService.get_current_user),
-):
-    edit_message.update_by = current_user.user.user_name
-    edit_message.update_time = datetime.now()
-    edit_message_result = await MessageService.edit_message_services(query_db, edit_message)
-    logger.info(edit_message_result.message)
+# @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: EditMessageModel,
+#     query_db: AsyncSession = Depends(get_db),
+#     current_user: CurrentUserModel = Depends(LoginService.get_current_user),
+# ):
+#     edit_message.update_by = current_user.user.user_name
+#     edit_message.update_time = datetime.now()
+#     edit_message_result = await MessageService.edit_message_services(query_db, edit_message)
+#     logger.info(edit_message_result.message)
 
-    return ResponseUtil.success(msg=edit_message_result.message)
+#     return ResponseUtil.success(msg=edit_message_result.message)
 
 
-@messageController.delete('/{message_ids}'
-    , dependencies=[Depends(CheckUserInterfaceAuth('system:message:remove'))]
-                          )
-@Log(title='系统消息', business_type=BusinessType.DELETE)
-async def delete_system_message(request: Request, message_ids: str, query_db: AsyncSession = Depends(get_db)):
-    delete_message = DeleteMessageModel(messageIds=message_ids)
-    delete_message_result = await MessageService.delete_message_services(query_db, delete_message)
-    logger.info(delete_message_result.message)
+# @messageController.delete('/{message_ids}'
+#     , dependencies=[Depends(CheckUserInterfaceAuth('system:message:remove'))]
+#                           )
+# @Log(title='系统消息', business_type=BusinessType.DELETE)
+# async def delete_system_message(request: Request, message_ids: str, query_db: AsyncSession = Depends(get_db)):
+#     delete_message = DeleteMessageModel(messageIds=message_ids)
+#     delete_message_result = await MessageService.delete_message_services(query_db, delete_message)
+#     logger.info(delete_message_result.message)
 
-    return ResponseUtil.success(msg=delete_message_result.message)
+#     return ResponseUtil.success(msg=delete_message_result.message)
 
 
-@messageController.get(
-    '/{message_id}', response_model=MessageModel
-    # , dependencies=[Depends(CheckUserInterfaceAuth('system:message:query'))]
-)
-async def query_detail_system_message(request: Request, message_id: int, query_db: AsyncSession = Depends(get_db)):
-    message_detail_result = await MessageService.message_detail_services(query_db, message_id)
-    logger.info(f'获取message_id为{message_id}的信息成功')
+# @messageController.get(
+#     '/{message_id}', response_model=MessageModel
+#     # , dependencies=[Depends(CheckUserInterfaceAuth('system:message:query'))]
+# )
+# async def query_detail_system_message(request: Request, message_id: int, query_db: AsyncSession = Depends(get_db)):
+#     message_detail_result = await MessageService.message_detail_services(query_db, message_id)
+#     logger.info(f'获取message_id为{message_id}的信息成功')
 
-    return ResponseUtil.success(data=message_detail_result)
+#     return ResponseUtil.success(data=message_detail_result)
 
 
 # @messageController.post('/export', dependencies=[Depends(CheckUserInterfaceAuth('system:message:export'))])

ruoyi-fastapi-backend/module_admin/controller/sys_alert_controller.py

@@ -20,11 +20,12 @@ sys_alertController = APIRouter(prefix='/system/sys_alert', dependencies=[Depend
 
 
 # @sys_alertController.get(
-#     '/list', response_model=PageResponseModel, dependencies=[Depends(CheckUserInterfaceAuth('system:sys_alert:list'))]
+#     '/list', response_model=PageResponseModel
+#     # , dependencies=[Depends(CheckUserInterfaceAuth('system:sys_alert:list'))]
 # )
 # async def get_system_sys_alert_list(
 #     request: Request,
-# sys_alert_page_query: Sys_alertPageQueryModel = Depends(Sys_alertPageQueryModel.as_query),
+#     sys_alert_page_query: Sys_alertPageQueryModel = Depends(Sys_alertPageQueryModel.as_query),
 #     query_db: AsyncSession = Depends(get_db),
 # ):
 #     # 获取分页数据

ruoyi-fastapi-backend/module_admin/service/message_service.py

@@ -13,6 +13,16 @@ class MessageService:
     """
     系统消息模块服务层
     """
+    # 获取告警消息列表
+    @classmethod
+    async def get_alert_message_services(cls, query_db: AsyncSession, pageNum, pageSize):
+        t = MessagePageQueryModel()
+        t.type = '0'
+        t.page_num = pageNum
+        t.page_size = pageSize
+        return await MessageDao.get_message_list(query_db, t, True)
+    
+    
     # 获取告警消息分布
     @classmethod
     async def get_alarm_type_distribution_services(cls, query_db: AsyncSession):

ruoyi-fastapi-backend/server.py

@@ -115,7 +115,7 @@ controller_list = [
     {'router': doorController, 'tags': ['门禁设备管理']},
     {'router': identification_statisticsController, 'tags': ['识别统计管理']},
     {'router': haikang_controller, 'tags': ['海康']},
-    {'router': sys_alertController, 'tags': ['系统告警消息']}
+    # {'router': sys_alertController, 'tags': ['系统告警消息']}
 
 ]