From 0ea4f730ed840a4d6f858dca0e5078ca250a5ff4 Mon Sep 17 00:00:00 2001
From: duwenyuan <15600000461@163.com>
Date: Thu, 14 May 2026 16:38:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=8A=E8=AD=A6=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E6=98=AF=E5=90=A6=E5=90=AF=E7=94=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/modules/Util/PrometheusAlertManager.java    | 7 ++-----
 .../jeecg/modules/service/impl/AlarmRuleServiceImpl.java  | 8 +++++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/Util/PrometheusAlertManager.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/Util/PrometheusAlertManager.java
index 56259694..abaab3d8 100644
--- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/Util/PrometheusAlertManager.java
+++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/Util/PrometheusAlertManager.java
@@ -389,6 +389,8 @@ public class PrometheusAlertManager {
 
         // 6. 重载 Prometheus
         reloadPrometheus();
+        // 删除备份文件
+        deleteFile(fullPath+ ".backup");
         log.info("告警规则 [{}] 已成功同步至 Prometheus", alarmRule.getName());
         return true;
     }
@@ -671,11 +673,6 @@ public class PrometheusAlertManager {
             // 删除规则文件
             deleteFile(rulePath);
 
-            // 验证配置
-            if (!validatePrometheusConfig()) {
-                throw new Exception("删除告警规则后配置验证失败");
-            }
-
             // 重新加载Prometheus
             reloadPrometheus();
 
diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java
index 94a0e482..6c6cef00 100644
--- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java
+++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java
@@ -127,7 +127,7 @@ public class AlarmRuleServiceImpl extends ServiceImpl<AlarmRuleMapper, AlarmRule
                 prometheusAlertManager.saveOrUpdateAlarmRule(alarmRule);
             } catch (Exception e) {
                 log.error("规则同步到 Prometheus 错误："+e.getMessage());
-                return Result.error(Prompt.ADD_ERR);
+                return Result.error(Prompt.UPDATE_ERR);
             }
             return Result.OK(Prompt.UPDATE_SUCC);
         }
@@ -263,10 +263,16 @@ public class AlarmRuleServiceImpl extends ServiceImpl<AlarmRuleMapper, AlarmRule
             switch (enabledE){
                 case ENABLED:
                     redisUtil.set(ruleKey, alarmRule);
+                    try {
+                        prometheusAlertManager.saveOrUpdateAlarmRule(alarmRule);
+                    } catch (Exception e) {
+                        log.error("将新增的规则同步到 Prometheus 错误："+e.getMessage());
+                    }
                     break;
                 case DISENABLED:
                     if (redisUtil.hasKey(ruleKey))
                         redisUtil.del(ruleKey);
+                    prometheusAlertManager.deleteAlertRule(alarmRule.getId() + ".yml");
                     break;
                 default:
                     break;