From 1d5c579e648946f7338568a3a4735970df1b0fe9 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Tue, 7 Oct 2025 15:46:53 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E4=BF=AE=E6=94=B9=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AlarmEventController.java | 16 +++++----- .../monitor/convert/AlarmEventConvert.java | 2 +- .../module/monitor/dao/AlarmEventDAO.java | 2 +- .../operator/AlarmEventOperatorType.java | 8 ++--- .../monitor/entity/domain/AlarmEventDO.java | 4 +-- .../request/alarm/AlarmEventClearRequest.java | 4 +-- .../alarm/AlarmEventHandleRequest.java | 4 +-- .../request/alarm/AlarmEventQueryRequest.java | 4 +-- .../alarm/AlarmEventSetFalseRequest.java | 4 +-- .../monitor/entity/vo/AlarmEventVO.java | 4 +-- .../monitor/enums/AlarmHandleStatusEnum.java | 2 +- .../monitor/service/AlarmEventService.java | 18 +++++------ .../service/impl/AlarmEventServiceImpl.java | 2 +- orion-visor-ui/src/api/monitor/alarm-event.ts | 22 ++++++------- .../components/alarm-event-table-base.vue | 2 +- .../views/monitor/alarm-event/types/const.ts | 2 +- .../components/alarm-rule-form-drawer.vue | 32 ++++++++++++------- .../compoments/detail-header.vue | 4 +-- sql/init-2-schema-tables.sql | 2 +- sql/init-4-data.sql | 22 ++++++------- 20 files changed, 85 insertions(+), 75 deletions(-) diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/controller/AlarmEventController.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/controller/AlarmEventController.java index c6666655..4977a0f7 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/controller/AlarmEventController.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/controller/AlarmEventController.java @@ -48,13 +48,13 @@ import javax.annotation.Resource; import java.util.List; /** - * 告警记录 api + * 告警事件 api * * @author Jiahang Li * @version 1.0.0 * @since 2025-9-17 21:31 */ -@Tag(name = "monitor - 告警记录服务") +@Tag(name = "monitor - 告警事件服务") @Slf4j @Validated @RestWrapper @@ -67,7 +67,7 @@ public class AlarmEventController { @IgnoreLog(IgnoreLogMode.RET) @PostMapping("/query") - @Operation(summary = "分页查询告警记录") + @Operation(summary = "分页查询告警事件") @PreAuthorize("@ss.hasPermission('monitor:alarm-event:query')") public DataGrid getAlarmEventPage(@Validated(Page.class) @RequestBody AlarmEventQueryRequest request) { return alarmEventService.getAlarmEventPage(request); @@ -76,7 +76,7 @@ public class AlarmEventController { @IgnoreLog(IgnoreLogMode.RET) @OperatorLog(AlarmEventOperatorType.HANDLE) @PostMapping("/handle") - @Operation(summary = "处理告警记录") + @Operation(summary = "处理告警事件") @PreAuthorize("@ss.hasPermission('monitor:alarm-event:handle')") public Integer handleAlarmEvent(@Validated @RequestBody AlarmEventHandleRequest request) { return alarmEventService.handleAlarmEvent(request); @@ -92,7 +92,7 @@ public class AlarmEventController { } @PostMapping("/count") - @Operation(summary = "查询告警记录数量") + @Operation(summary = "查询告警事件数量") @PreAuthorize("@ss.hasPermission('monitor:alarm-event:query')") public Long getAlarmEventCount(@Validated @RequestBody AlarmEventQueryRequest request) { return alarmEventService.getAlarmEventCount(request); @@ -101,7 +101,7 @@ public class AlarmEventController { @DemoDisableApi @OperatorLog(AlarmEventOperatorType.DELETE) @DeleteMapping("/delete") - @Operation(summary = "删除告警记录") + @Operation(summary = "删除告警事件") @Parameter(name = "id", description = "id", required = true) @PreAuthorize("@ss.hasPermission('monitor:alarm-event:delete')") public Integer deleteAlarmEvent(@RequestParam("id") Long id) { @@ -111,7 +111,7 @@ public class AlarmEventController { @DemoDisableApi @OperatorLog(AlarmEventOperatorType.DELETE) @DeleteMapping("/batch-delete") - @Operation(summary = "批量删除告警记录") + @Operation(summary = "批量删除告警事件") @Parameter(name = "idList", description = "idList", required = true) @PreAuthorize("@ss.hasPermission('monitor:alarm-event:delete')") public Integer batchDeleteAlarmEvent(@RequestParam("idList") List idList) { @@ -121,7 +121,7 @@ public class AlarmEventController { @DemoDisableApi @OperatorLog(AlarmEventOperatorType.CLEAR) @PostMapping("/clear") - @Operation(summary = "清理告警记录") + @Operation(summary = "清理告警事件") @PreAuthorize("@ss.hasPermission('monitor:alarm-event:management:clear')") public Integer clearAlarmEvent(@Validated @RequestBody AlarmEventClearRequest request) { return alarmEventService.clearAlarmEvent(request); diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/convert/AlarmEventConvert.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/convert/AlarmEventConvert.java index 02ff51e9..37fbc756 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/convert/AlarmEventConvert.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/convert/AlarmEventConvert.java @@ -34,7 +34,7 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 监控告警记录 内部对象转换器 + * 监控告警事件 内部对象转换器 * * @author Jiahang Li * @version 1.0.0 diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/dao/AlarmEventDAO.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/dao/AlarmEventDAO.java index 723e56ce..bca1dda3 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/dao/AlarmEventDAO.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/dao/AlarmEventDAO.java @@ -32,7 +32,7 @@ import java.util.Date; import java.util.List; /** - * 监控告警记录 Mapper 接口 + * 监控告警事件 Mapper 接口 * * @author Jiahang Li * @version 1.0.0 diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/define/operator/AlarmEventOperatorType.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/define/operator/AlarmEventOperatorType.java index e81fbb6a..c52a625b 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/define/operator/AlarmEventOperatorType.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/define/operator/AlarmEventOperatorType.java @@ -30,7 +30,7 @@ import static org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRi import static org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.L; /** - * 监控告警记录 操作日志类型 + * 监控告警事件 操作日志类型 * * @author Jiahang Li * @version 1.0.0 @@ -51,9 +51,9 @@ public class AlarmEventOperatorType extends InitializingOperatorTypes { public OperatorType[] types() { return new OperatorType[]{ new OperatorType(L, HANDLE, "设置告警状态为 ${status} ${count} 条"), - new OperatorType(L, SET_FALSE, "设置告警记录为误报 ${count} 条"), - new OperatorType(H, DELETE, "删除告警记录 ${count} 条"), - new OperatorType(H, CLEAR, "清理告警记录 ${count} 条"), + new OperatorType(L, SET_FALSE, "设置告警事件为误报 ${count} 条"), + new OperatorType(H, DELETE, "删除告警事件 ${count} 条"), + new OperatorType(H, CLEAR, "清理告警事件 ${count} 条"), }; } diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/domain/AlarmEventDO.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/domain/AlarmEventDO.java index d8119157..a9c0fab4 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/domain/AlarmEventDO.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/domain/AlarmEventDO.java @@ -36,7 +36,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * 监控告警记录 实体对象 + * 监控告警事件 实体对象 * * @author Jiahang Li * @version 1.0.0 @@ -48,7 +48,7 @@ import java.util.Date; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName(value = "monitor_alarm_event", autoResultMap = true) -@Schema(name = "AlarmEventDO", description = "监控告警记录 实体对象") +@Schema(name = "AlarmEventDO", description = "监控告警事件 实体对象") public class AlarmEventDO extends BaseDO { private static final long serialVersionUID = 1L; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventClearRequest.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventClearRequest.java index b3e9ebc0..dcb7811d 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventClearRequest.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventClearRequest.java @@ -32,7 +32,7 @@ import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; /** - * 监控告警记录 清理请求对象 + * 监控告警事件 清理请求对象 * * @author Jiahang Li * @version 1.0.0 @@ -40,7 +40,7 @@ import javax.validation.constraints.NotNull; */ @Data @EqualsAndHashCode(callSuper = true) -@Schema(name = "AlarmEventClearRequest", description = "监控告警记录 清理请求对象") +@Schema(name = "AlarmEventClearRequest", description = "监控告警事件 清理请求对象") public class AlarmEventClearRequest extends AlarmEventQueryRequest implements DataClearRequest { @NotNull diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventHandleRequest.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventHandleRequest.java index 2387b5b2..d0af6772 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventHandleRequest.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventHandleRequest.java @@ -38,7 +38,7 @@ import java.util.Date; import java.util.List; /** - * 监控告警记录 更新请求对象 + * 监控告警事件 更新请求对象 * * @author Jiahang Li * @version 1.0.0 @@ -48,7 +48,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "AlarmEventUpdateRequest", description = "监控告警记录 更新请求对象") +@Schema(name = "AlarmEventUpdateRequest", description = "监控告警事件 更新请求对象") public class AlarmEventHandleRequest implements Serializable { private static final long serialVersionUID = 1L; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventQueryRequest.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventQueryRequest.java index caa8bcf5..5ea96e89 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventQueryRequest.java @@ -31,7 +31,7 @@ import javax.validation.constraints.Size; import java.util.Date; /** - * 监控告警记录 查询请求对象 + * 监控告警事件 查询请求对象 * * @author Jiahang Li * @version 1.0.0 @@ -42,7 +42,7 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "AlarmEventQueryRequest", description = "监控告警记录 查询请求对象") +@Schema(name = "AlarmEventQueryRequest", description = "监控告警事件 查询请求对象") public class AlarmEventQueryRequest extends BaseQueryRequest { @Schema(description = "id") diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventSetFalseRequest.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventSetFalseRequest.java index 29e44080..df8bf435 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventSetFalseRequest.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/request/alarm/AlarmEventSetFalseRequest.java @@ -33,7 +33,7 @@ import java.io.Serializable; import java.util.List; /** - * 监控告警记录 设置误报请求对象 + * 监控告警事件 设置误报请求对象 * * @author Jiahang Li * @version 1.0.0 @@ -43,7 +43,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "AlarmEventSetFalseRequest", description = "监控告警记录 设置误报请求对象") +@Schema(name = "AlarmEventSetFalseRequest", description = "监控告警事件 设置误报请求对象") public class AlarmEventSetFalseRequest implements Serializable { private static final long serialVersionUID = 1L; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/vo/AlarmEventVO.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/vo/AlarmEventVO.java index b496a310..a5316e5b 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/vo/AlarmEventVO.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/vo/AlarmEventVO.java @@ -33,7 +33,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * 监控告警记录 视图响应对象 + * 监控告警事件 视图响应对象 * * @author Jiahang Li * @version 1.0.0 @@ -43,7 +43,7 @@ import java.util.Date; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "AlarmEventVO", description = "监控告警记录 视图响应对象") +@Schema(name = "AlarmEventVO", description = "监控告警事件 视图响应对象") public class AlarmEventVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/enums/AlarmHandleStatusEnum.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/enums/AlarmHandleStatusEnum.java index d15e369d..c255c2d2 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/enums/AlarmHandleStatusEnum.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/enums/AlarmHandleStatusEnum.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.monitor.enums; /** - * 告警记录处理状态 + * 告警事件处理状态 * * @author Jiahang Li * @version 1.0.0 diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/AlarmEventService.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/AlarmEventService.java index 952ab763..9cbff4d6 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/AlarmEventService.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/AlarmEventService.java @@ -35,7 +35,7 @@ import org.dromara.visor.module.monitor.entity.vo.AlarmEventVO; import java.util.List; /** - * 监控告警记录 服务类 + * 监控告警事件 服务类 * * @author Jiahang Li * @version 1.0.0 @@ -44,14 +44,14 @@ import java.util.List; public interface AlarmEventService { /** - * 创建监控告警记录 + * 创建监控告警事件 * * @param record record */ void createAlarmEvent(AlarmEventDO record); /** - * 处理告警记录 + * 处理告警事件 * * @param request request * @return effect @@ -67,7 +67,7 @@ public interface AlarmEventService { Integer setAlarmEventFalse(AlarmEventSetFalseRequest request); /** - * 分页查询监控告警记录 + * 分页查询监控告警事件 * * @param request request * @return rows @@ -75,7 +75,7 @@ public interface AlarmEventService { DataGrid getAlarmEventPage(AlarmEventQueryRequest request); /** - * 查询监控告警记录数量 + * 查询监控告警事件数量 * * @param request request * @return count @@ -83,7 +83,7 @@ public interface AlarmEventService { Long getAlarmEventCount(AlarmEventQueryRequest request); /** - * 删除监控告警记录 + * 删除监控告警事件 * * @param id id * @return effect @@ -91,7 +91,7 @@ public interface AlarmEventService { Integer deleteAlarmEventById(Long id); /** - * 批量删除监控告警记录 + * 批量删除监控告警事件 * * @param idList idList * @return effect @@ -99,7 +99,7 @@ public interface AlarmEventService { Integer deleteAlarmEventByIdList(List idList); /** - * 清理监控告警记录 + * 清理监控告警事件 * * @param request request * @return effect @@ -107,7 +107,7 @@ public interface AlarmEventService { Integer clearAlarmEvent(AlarmEventClearRequest request); /** - * 获取策略告警记录数量 + * 获取策略告警事件数量 * * @param policyIdList policyIdList * @param startDay startDay diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmEventServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmEventServiceImpl.java index 612ac92d..0838c56d 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmEventServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmEventServiceImpl.java @@ -62,7 +62,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** - * 监控告警记录 服务实现类 + * 监控告警事件 服务实现类 * * @author Jiahang Li * @version 1.0.0 diff --git a/orion-visor-ui/src/api/monitor/alarm-event.ts b/orion-visor-ui/src/api/monitor/alarm-event.ts index 28eff525..9c3f8d65 100644 --- a/orion-visor-ui/src/api/monitor/alarm-event.ts +++ b/orion-visor-ui/src/api/monitor/alarm-event.ts @@ -4,7 +4,7 @@ import axios from 'axios'; import qs from 'query-string'; /** - * 告警记录处理请求 + * 告警事件处理请求 */ export interface AlarmEventHandleRequest { idList?: Array; @@ -14,14 +14,14 @@ export interface AlarmEventHandleRequest { } /** - * 告警记录误报请求 + * 告警事件误报请求 */ export interface AlarmEventFalseAlarmRequest { idList?: Array; } /** - * 告警记录查询请求 + * 告警事件查询请求 */ export interface AlarmEventQueryRequest extends Pagination, OrderDirection { id?: number; @@ -39,13 +39,13 @@ export interface AlarmEventQueryRequest extends Pagination, OrderDirection { } /** - * 告警记录清理请求 + * 告警事件清理请求 */ export interface AlarmEventClearRequest extends AlarmEventQueryRequest, ClearRequest { } /** - * 告警记录查询响应 + * 告警事件查询响应 */ export interface AlarmEventQueryResponse extends TableData { id: number; @@ -75,7 +75,7 @@ export interface AlarmEventQueryResponse extends TableData { } /** - * 处理告警记录 + * 处理告警事件 */ export function handleAlarmEvent(request: AlarmEventHandleRequest) { return axios.post('/monitor/alarm-event/handle', request); @@ -89,28 +89,28 @@ export function setAlarmEventFalse(request: AlarmEventFalseAlarmRequest) { } /** - * 分页查询告警记录 + * 分页查询告警事件 */ export function getAlarmEventPage(request: AlarmEventQueryRequest) { return axios.post>('/monitor/alarm-event/query', request); } /** - * 查询告警记录数量 + * 查询告警事件数量 */ export function getAlarmEventCount(request: AlarmEventQueryRequest) { return axios.post('/monitor/alarm-event/count', request); } /** - * 删除告警记录 + * 删除告警事件 */ export function deleteAlarmEvent(id: number) { return axios.delete('/monitor/alarm-event/delete', { params: { id } }); } /** - * 批量删除告警记录 + * 批量删除告警事件 */ export function batchDeleteAlarmEvent(idList: Array) { return axios.delete('/monitor/alarm-event/batch-delete', { @@ -122,7 +122,7 @@ export function batchDeleteAlarmEvent(idList: Array) { } /** - * 清理告警记录 + * 清理告警事件 */ export function clearMonitorAlarmEvent(request: AlarmEventClearRequest) { return axios.post('/monitor/alarm-event/clear', request); diff --git a/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table-base.vue b/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table-base.vue index 1c161fa1..be1b30c9 100644 --- a/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table-base.vue +++ b/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table-base.vue @@ -6,7 +6,7 @@
- 告警记录列表 + 告警事件列表
diff --git a/orion-visor-ui/src/views/monitor/alarm-event/types/const.ts b/orion-visor-ui/src/views/monitor/alarm-event/types/const.ts index 8fdb1971..7cc527d7 100644 --- a/orion-visor-ui/src/views/monitor/alarm-event/types/const.ts +++ b/orion-visor-ui/src/views/monitor/alarm-event/types/const.ts @@ -14,7 +14,7 @@ export const FalseAlarm = { // 告警条件 字典项 export const TriggerConditionKey = 'alarmTriggerCondition'; -// 告警记录处理状态 字典项 +// 告警事件处理状态 字典项 export const HandleStatusKey = 'alarmEventHandleStatus'; // 是否为误报 字典项 diff --git a/orion-visor-ui/src/views/monitor/alarm-rule/components/alarm-rule-form-drawer.vue b/orion-visor-ui/src/views/monitor/alarm-rule/components/alarm-rule-form-drawer.vue index a88e4555..e10d983f 100644 --- a/orion-visor-ui/src/views/monitor/alarm-rule/components/alarm-rule-form-drawer.vue +++ b/orion-visor-ui/src/views/monitor/alarm-rule/components/alarm-rule-form-drawer.vue @@ -35,21 +35,26 @@ - + + style="width: 108px;" + placeholder="标签名称" /> + allow-create> + + >([]); const hasTags = ref(false); const measurement = ref(''); - const measurementTags = ref>({}); + const = ref>({}); const defaultForm = (): AlarmRuleUpdateRequest => { return { @@ -326,13 +330,13 @@ // 加载全部标签 const loadTags = () => { - const tags = measurementTags.value[measurement.value]; + const tags = .value[measurement.value]; if (tags) { return; } // 加载标签 getMonitorHostPolicyRuleTags(formModel.value.policyId as number, measurement.value).then(({ data }) => { - measurementTags.value[measurement.value as any] = data; + .value[measurement.value as any] = data; }); }; @@ -420,6 +424,11 @@ margin-right: 12px; } + .tag-wrapper { + width: 100%; + justify-content: space-between; + } + .alarm-level-select, .condition-select { :deep(.arco-select-view-suffix) { @@ -430,4 +439,5 @@ :deep(.tag-values .arco-select-view-inner) { flex-wrap: nowrap !important; } + diff --git a/orion-visor-ui/src/views/monitor/monitor-detail/compoments/detail-header.vue b/orion-visor-ui/src/views/monitor/monitor-detail/compoments/detail-header.vue index 0f2e0236..96a03de6 100644 --- a/orion-visor-ui/src/views/monitor/monitor-detail/compoments/detail-header.vue +++ b/orion-visor-ui/src/views/monitor/monitor-detail/compoments/detail-header.vue @@ -9,7 +9,7 @@ :hide-content="true"> - +
- +
更新时间: {{ dateFormat(new Date(overrideTimestamp)) }}
diff --git a/sql/init-2-schema-tables.sql b/sql/init-2-schema-tables.sql index d987e390..1bd2860c 100644 --- a/sql/init-2-schema-tables.sql +++ b/sql/init-2-schema-tables.sql @@ -580,7 +580,7 @@ CREATE TABLE `monitor_alarm_event` ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 - COLLATE = utf8mb4_unicode_ci COMMENT = '监控告警记录' + COLLATE = utf8mb4_unicode_ci COMMENT = '监控告警事件' ROW_FORMAT = Dynamic; -- ---------------------------- diff --git a/sql/init-4-data.sql b/sql/init-4-data.sql index f4e45a2f..5a5e4a60 100644 --- a/sql/init-4-data.sql +++ b/sql/init-4-data.sql @@ -143,7 +143,7 @@ INSERT INTO `dict_key` VALUES (86, 'notifyBizType', 'STRING', '[]', '通知业 INSERT INTO `dict_key` VALUES (87, 'notifyChannelType', 'STRING', '[{\"name\": \"color\", \"type\": \"COLOR\"}, {\"name\": \"notifyType\", \"type\": \"STRING\"}, {\"name\": \"templateTips\", \"type\": \"STRING\"}]', '通知渠道类型', '2025-09-13 13:35:03', '2025-09-20 22:26:20', 'admin', 'admin', 0); INSERT INTO `dict_key` VALUES (88, 'alarmTriggerCondition', 'STRING', '[]', '告警条件', '2025-09-14 05:36:35', '2025-09-14 05:36:35', 'admin', 'admin', 0); INSERT INTO `dict_key` VALUES (89, 'alarmLevel', 'INTEGER', '[{\"name\": \"level\", \"type\": \"STRING\"}, {\"name\": \"color\", \"type\": \"STRING\"}]', '告警等级', '2025-09-14 05:36:36', '2025-09-14 05:36:36', 'admin', 'admin', 0); -INSERT INTO `dict_key` VALUES (90, 'alarmEventHandleStatus', 'STRING', '[{\"name\": \"color\", \"type\": \"STRING\"}]', '告警记录处理状态', '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); +INSERT INTO `dict_key` VALUES (90, 'alarmEventHandleStatus', 'STRING', '[{\"name\": \"color\", \"type\": \"STRING\"}]', '告警事件处理状态', '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); INSERT INTO `dict_key` VALUES (92, 'falseAlarm', 'INTEGER', '[]', '是否为误报', '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); -- 字典值 @@ -574,11 +574,11 @@ INSERT INTO `dict_value` VALUES (600, 89, 'alarmLevel', '3', '警告', '{\"color INSERT INTO `dict_value` VALUES (601, 89, 'alarmLevel', '4', '信息', '{\"color\": \"gray\", \"level\": \"Info\"}', 50, '2025-09-14 05:36:36', '2025-09-14 05:36:36', 'admin', 'admin', 0); INSERT INTO `dict_value` VALUES (602, 2, 'operatorLogType', 'alarm-policy:update-rule-switch', '更新监控告警规则开关', '{}', 80, '2025-09-14 05:36:35', '2025-09-14 06:35:40', 'admin', 'admin', 0); INSERT INTO `dict_value` VALUES (603, 87, 'notifyChannelType', 'WEBSITE', '站内信', '{\"color\": \"arcoblue\", \"notifyType\": \"website\", \"templateTips\": \"普通文本格式, 文本颜色以及参数请参考文档\"}', 5, '2025-09-13 13:35:03', '2025-09-20 22:54:37', 'admin', 'admin', 0); -INSERT INTO `dict_value` VALUES (604, 1, 'operatorLogModule', 'monitor:alarm-event', '告警记录', '{}', 2200, '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); -INSERT INTO `dict_value` VALUES (605, 2, 'operatorLogType', 'alarm-event:handle', '处理告警记录', '{}', 10, '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); -INSERT INTO `dict_value` VALUES (606, 2, 'operatorLogType', 'alarm-event:set-false', '设置告警记录误报', '{}', 20, '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); -INSERT INTO `dict_value` VALUES (607, 2, 'operatorLogType', 'alarm-event:delete', '删除告警记录', '{}', 30, '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); -INSERT INTO `dict_value` VALUES (608, 2, 'operatorLogType', 'alarm-event:clear', '清理告警记录', '{}', 40, '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); +INSERT INTO `dict_value` VALUES (604, 1, 'operatorLogModule', 'monitor:alarm-event', '告警事件', '{}', 2200, '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); +INSERT INTO `dict_value` VALUES (605, 2, 'operatorLogType', 'alarm-event:handle', '处理告警事件', '{}', 10, '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); +INSERT INTO `dict_value` VALUES (606, 2, 'operatorLogType', 'alarm-event:set-false', '设置告警事件误报', '{}', 20, '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); +INSERT INTO `dict_value` VALUES (607, 2, 'operatorLogType', 'alarm-event:delete', '删除告警事件', '{}', 30, '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); +INSERT INTO `dict_value` VALUES (608, 2, 'operatorLogType', 'alarm-event:clear', '清理告警事件', '{}', 40, '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); INSERT INTO `dict_value` VALUES (609, 90, 'alarmEventHandleStatus', 'NEW', '新告警', '{\"color\": \"red\"}', 10, '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); INSERT INTO `dict_value` VALUES (610, 90, 'alarmEventHandleStatus', 'CONFIRMED', '已确认', '{\"color\": \"orangered\"}', 20, '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); INSERT INTO `dict_value` VALUES (611, 90, 'alarmEventHandleStatus', 'RESOLVE', '已解决', '{\"color\": \"green\"}', 30, '2025-09-17 16:20:03', '2025-09-17 16:20:03', 'admin', 'admin', 0); @@ -733,8 +733,8 @@ INSERT INTO `system_menu` VALUES (304, 300, '复制告警策略', 'monitor:alarm INSERT INTO `system_menu` VALUES (305, 300, '删除告警策略', 'monitor:alarm-policy:delete', 3, 50, 1, 1, 1, 0, NULL, NULL, NULL, '2025-09-13 16:13:36', '2025-09-13 17:10:41', 'admin', 'admin', 0); INSERT INTO `system_menu` VALUES (306, 300, '修改告警规则', 'monitor:alarm-policy:update-rule', 3, 60, 1, 1, 1, 0, NULL, NULL, NULL, '2025-09-14 14:34:25', '2025-09-14 14:34:25', 'admin', 'admin', 0); INSERT INTO `system_menu` VALUES (307, 282, '告警规则', NULL, 2, 21, 0, 1, 1, 0, 'IconExperiment', NULL, 'alarmRule', '2025-09-15 00:01:55', '2025-09-20 22:12:16', 'admin', 'admin', 0); -INSERT INTO `system_menu` VALUES (308, 282, '告警记录', NULL, 2, 30, 1, 1, 1, 0, 'IconNotification', NULL, 'alarmEvent', '2025-09-17 16:06:34', '2025-09-20 22:11:32', 'admin', 'admin', 0); -INSERT INTO `system_menu` VALUES (309, 308, '查询告警记录', 'monitor:alarm-event:query', 3, 10, 1, 1, 1, 0, NULL, NULL, NULL, '2025-09-17 16:06:34', '2025-09-17 16:06:34', 'admin', 'admin', 0); -INSERT INTO `system_menu` VALUES (310, 308, '处理告警记录', 'monitor:alarm-event:handle', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2025-09-17 16:06:34', '2025-09-17 16:06:34', 'admin', 'admin', 0); -INSERT INTO `system_menu` VALUES (311, 308, '删除告警记录', 'monitor:alarm-event:delete', 3, 30, 1, 1, 1, 0, NULL, NULL, NULL, '2025-09-17 16:06:34', '2025-09-17 16:06:34', 'admin', 'admin', 0); -INSERT INTO `system_menu` VALUES (312, 308, '清理告警记录', 'monitor:alarm-event:management:clear', 3, 40, 1, 1, 1, 0, NULL, NULL, NULL, '2025-09-17 16:06:34', '2025-09-17 16:06:34', 'admin', 'admin', 0); +INSERT INTO `system_menu` VALUES (308, 282, '告警事件', NULL, 2, 30, 1, 1, 1, 0, 'IconNotification', NULL, 'alarmEvent', '2025-09-17 16:06:34', '2025-09-20 22:11:32', 'admin', 'admin', 0); +INSERT INTO `system_menu` VALUES (309, 308, '查询告警事件', 'monitor:alarm-event:query', 3, 10, 1, 1, 1, 0, NULL, NULL, NULL, '2025-09-17 16:06:34', '2025-09-17 16:06:34', 'admin', 'admin', 0); +INSERT INTO `system_menu` VALUES (310, 308, '处理告警事件', 'monitor:alarm-event:handle', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2025-09-17 16:06:34', '2025-09-17 16:06:34', 'admin', 'admin', 0); +INSERT INTO `system_menu` VALUES (311, 308, '删除告警事件', 'monitor:alarm-event:delete', 3, 30, 1, 1, 1, 0, NULL, NULL, NULL, '2025-09-17 16:06:34', '2025-09-17 16:06:34', 'admin', 'admin', 0); +INSERT INTO `system_menu` VALUES (312, 308, '清理告警事件', 'monitor:alarm-event:management:clear', 3, 40, 1, 1, 1, 0, NULL, NULL, NULL, '2025-09-17 16:06:34', '2025-09-17 16:06:34', 'admin', 'admin', 0);