From ba28940ee835e45e55d058c83e2e6fc82ed24978 Mon Sep 17 00:00:00 2001
From: tomsun28 <tomsun28@outlook.com>
Date: Tue, 22 Feb 2022 12:07:00 +0800
Subject: [PATCH] =?UTF-8?q?[manager,alerter]fix=E7=9B=91=E6=8E=A7=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=90=8E=E5=91=8A=E8=AD=A6=E5=AE=9A=E4=B9=89=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E6=9C=AA=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/usthe/alert/dao/AlertDefineBindDao.java | 12 ++++++++++++
 .../manager/service/impl/MonitorServiceImpl.java     |  7 +++++++
 2 files changed, 19 insertions(+)

diff --git a/alerter/src/main/java/com/usthe/alert/dao/AlertDefineBindDao.java b/alerter/src/main/java/com/usthe/alert/dao/AlertDefineBindDao.java
index d515798..48aecd3 100644
--- a/alerter/src/main/java/com/usthe/alert/dao/AlertDefineBindDao.java
+++ b/alerter/src/main/java/com/usthe/alert/dao/AlertDefineBindDao.java
@@ -19,6 +19,18 @@ public interface AlertDefineBindDao extends JpaRepository<AlertDefineMonitorBind
      */
     void deleteAlertDefineBindsByAlertDefineIdEquals(Long alertDefineId);
 
+    /**
+     * 根据监控ID删除告警定义监控关联
+     * @param monitorId 监控ID
+     */
+    void deleteAlertDefineMonitorBindsByMonitorIdEquals(Long monitorId);
+
+    /**
+     * 根据监控ID列表删除告警定义监控关联
+     * @param monitorIds 监控ID列表
+     */
+    void deleteAlertDefineMonitorBindsByMonitorIdIn(List<Long> monitorIds);
+
     /**
      * 根据告警定义ID查询监控关联信息
      * @param alertDefineId 告警定义ID
diff --git a/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java b/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java
index 3fbcda5..d795392 100644
--- a/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java
+++ b/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java
@@ -1,5 +1,6 @@
 package com.usthe.manager.service.impl;
 
+import com.usthe.alert.dao.AlertDefineBindDao;
 import com.usthe.collector.dispatch.entrance.internal.CollectJobService;
 import com.usthe.common.entity.job.Configmap;
 import com.usthe.common.entity.job.Job;
@@ -60,6 +61,9 @@ public class MonitorServiceImpl implements MonitorService {
     @Autowired
     private ParamDao paramDao;
 
+    @Autowired
+    private AlertDefineBindDao alertDefineBindDao;
+
     @Override
     @Transactional(readOnly = true)
     public void detectMonitor(Monitor monitor, List<Param> params) throws MonitorDetectException {
@@ -279,6 +283,7 @@ public class MonitorServiceImpl implements MonitorService {
             Monitor monitor = monitorOptional.get();
             monitorDao.deleteById(id);
             paramDao.deleteParamsByMonitorId(id);
+            alertDefineBindDao.deleteAlertDefineMonitorBindsByMonitorIdEquals(id);
             collectJobService.cancelAsyncCollectJob(monitor.getJobId());
         }
     }
@@ -290,6 +295,8 @@ public class MonitorServiceImpl implements MonitorService {
         if (monitors != null) {
             monitorDao.deleteAll(monitors);
             paramDao.deleteParamsByMonitorIdIn(ids);
+            alertDefineBindDao.deleteAlertDefineMonitorBindsByMonitorIdIn(monitors.stream()
+                    .map(Monitor::getId).collect(Collectors.toList()));
             for (Monitor monitor : monitors) {
                 collectJobService.cancelAsyncCollectJob(monitor.getJobId());
             }