From 9d3b46e9b30cd4de40b02cdd653e8812a04298f5 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Wed, 15 Oct 2025 15:07:37 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E7=AD=96=E7=95=A5=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E9=9D=9E=E5=BF=85=E5=A1=AB.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visor/module/monitor/dao/AlarmPolicyRuleDAO.java | 9 +++++++++ .../monitor/service/impl/AlarmPolicyServiceImpl.java | 2 +- .../alarm-policy/components/alarm-policy-form-modal.vue | 7 ++++--- .../src/views/monitor/alarm-policy/types/form.rules.ts | 3 --- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/dao/AlarmPolicyRuleDAO.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/dao/AlarmPolicyRuleDAO.java index 60b87ce5..70ed66e9 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/dao/AlarmPolicyRuleDAO.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/dao/AlarmPolicyRuleDAO.java @@ -59,4 +59,13 @@ public interface AlarmPolicyRuleDAO extends IMapper { return this.selectList(Conditions.eq(AlarmPolicyRuleDO::getPolicyId, policyId)); } + /** + * 通过 policyId 删除 + * + * @param policyId policyId + */ + default void deleteByPolicyId(Long policyId) { + this.delete(Conditions.eq(AlarmPolicyRuleDO::getPolicyId, policyId)); + } + } 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/AlarmPolicyServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java index 386fdce5..e072d773 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java @@ -266,7 +266,7 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService { // 删除策略通知 alarmPolicyNotifyDAO.deleteByPolicyId(id); // 删除策略规则 - alarmPolicyRuleService.deleteByPolicyId(id); + alarmPolicyRuleDAO.deleteByPolicyId(id); // 删除缓存 alarmEngineContext.reloadPolicy(id); log.info("AlarmPolicyService-deleteAlarmPolicyById effect: {}", effect); diff --git a/orion-visor-ui/src/views/monitor/alarm-policy/components/alarm-policy-form-modal.vue b/orion-visor-ui/src/views/monitor/alarm-policy/components/alarm-policy-form-modal.vue index 1373c891..3f8d8284 100644 --- a/orion-visor-ui/src/views/monitor/alarm-policy/components/alarm-policy-form-modal.vue +++ b/orion-visor-ui/src/views/monitor/alarm-policy/components/alarm-policy-form-modal.vue @@ -26,9 +26,10 @@ - + diff --git a/orion-visor-ui/src/views/monitor/alarm-policy/types/form.rules.ts b/orion-visor-ui/src/views/monitor/alarm-policy/types/form.rules.ts index ac59a73b..3b3db170 100644 --- a/orion-visor-ui/src/views/monitor/alarm-policy/types/form.rules.ts +++ b/orion-visor-ui/src/views/monitor/alarm-policy/types/form.rules.ts @@ -9,9 +9,6 @@ const rules = { message: '策略名称长度不能大于64位' }], description: [{ - required: true, - message: '请输入策略描述' - }, { maxLength: 255, message: '策略描述长度不能大于255位' }],