[monitor] 通知策略支持启用关闭

manager/src/main/java/com/usthe/manager/dao/NoticeRuleDao.java

@@ -4,6 +4,8 @@ import com.usthe.manager.pojo.entity.NoticeRule;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.util.List;
+
 /**
  * NoticeRule数据库操作
  * @author tom
@@ -11,4 +13,9 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  */
 public interface NoticeRuleDao extends JpaRepository<NoticeRule, Long>, JpaSpecificationExecutor<NoticeRule> {
 
+    /**
+     * 查询所有已启用的通知策略
+     * @return 通知策略
+     */
+    List<NoticeRule> findNoticeRulesByEnableTrue();
 }

manager/src/main/java/com/usthe/manager/service/impl/NoticeConfigServiceImpl.java

@@ -12,7 +12,6 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -76,10 +75,10 @@ public class NoticeConfigServiceImpl implements NoticeConfigService {
     @Override
     public List<NoticeReceiver> getReceiverFilterRule(Alert alert) {
         // todo 使用缓存
-        List<NoticeRule> rules = noticeRuleDao.findAll();
+        List<NoticeRule> rules = noticeRuleDao.findNoticeRulesByEnableTrue();
         // todo 暂时规则是全部转发 后面实现更多匹配规则：告警状态选择 监控类型选择等
         Set<Long> receiverIds = rules.stream()
-                .filter(item -> item.isFilterAll() && item.isEnable())
+                .filter(NoticeRule::isFilterAll)
                 .map(NoticeRule::getReceiverId)
                 .collect(Collectors.toSet());
         return noticeReceiverDao.findAllById(receiverIds);

web-app/src/app/routes/alert/alert-notice/alert-notice.component.html

@@ -234,6 +234,12 @@
           </nz-select>
         </nz-form-control>
       </nz-form-item >
+      <nz-form-item>
+        <nz-form-label nzSpan="7" nzRequired="true" nzFor= "enable">是否启用</nz-form-label>
+        <nz-form-control nzSpan="8">
+          <nz-switch [(ngModel)]="rule.enable" name="enable" id="enable"></nz-switch>
+        </nz-form-control>
+      </nz-form-item >
     </form>
   </div>
 </nz-modal>