重构消息报警通知模块, 以报警平台、类型纬度拆分.

hippo4j-config/src/main/java/cn/hippo4j/config/mapper/NotifyInfoMapper.java

@@ -1,15 +1,15 @@
 package cn.hippo4j.config.mapper;
 
-import cn.hippo4j.config.model.AlarmInfo;
+import cn.hippo4j.config.model.NotifyInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * Alarm info mapper.
+ * Notify info mapper.
  *
  * @author chen.ma
  * @date 2021/11/17 22:04
  */
 @Mapper
-public interface AlarmInfoMapper extends BaseMapper<AlarmInfo> {
+public interface NotifyInfoMapper extends BaseMapper<NotifyInfo> {
 }

hippo4j-config/src/main/java/cn/hippo4j/config/model/NotifyInfo.java

@@ -1,5 +1,6 @@
 package cn.hippo4j.config.model;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -7,14 +8,14 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 报警管理.
+ * 通知管理.
  *
  * @author chen.ma
  * @date 2021/11/17 22:03
  */
 @Data
-@TableName("alarm")
+@TableName("notify")
-public class AlarmInfo {
+public class NotifyInfo {
 
     /**
      * id
@@ -41,6 +42,11 @@ public class AlarmInfo {
      */
     private String platform;
 
+    /**
+     * 通知类型
+     */
+    private String type;
+
     /**
      * 密钥
      */
@@ -60,16 +66,24 @@ public class AlarmInfo {
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date gmtCreate;
 
     /**
      * 修改时间
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date gmtModified;
 
+    /**
+     * 是否启用
+     */
+    private Integer enable;
+
     /**
      * 是否删除
      */
+    @TableField(fill = FieldFill.INSERT)
     private Integer delFlag;
 
 }

hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/alarm/AlarmListRespDTO.java

@@ -1,29 +0,0 @@
-package cn.hippo4j.config.model.biz.alarm;
-
-import cn.hippo4j.config.model.AlarmInfo;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Alarm list resp dto.
- *
- * @author chen.ma
- * @date 2021/11/17 22:53
- */
-@Data
-@AllArgsConstructor
-public class AlarmListRespDTO {
-
-    /**
-     * 线程池ID
-     */
-    private String threadPoolId;
-
-    /**
-     * 报警配置
-     */
-    private List<AlarmInfo> alarmNotifyList;
-
-}

hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/alarm/AlarmQueryReqDTO.java

@@ -1,22 +0,0 @@
-package cn.hippo4j.config.model.biz.alarm;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Alarm query req dto.
- *
- * @author chen.ma
- * @date 2021/11/17 22:52
- */
-@Data
-public class AlarmQueryReqDTO extends Page {
-
-    /**
-     * groupKeys
-     */
-    private List<String> groupKeys;
-
-}

hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyListRespDTO.java

@@ -0,0 +1,29 @@
+package cn.hippo4j.config.model.biz.notify;
+
+import cn.hippo4j.config.model.NotifyInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Notify list resp dto.
+ *
+ * @author chen.ma
+ * @date 2021/11/17 22:53
+ */
+@Data
+@AllArgsConstructor
+public class NotifyListRespDTO {
+
+    /**
+     * 通知 Key
+     */
+    private String notifyKey;
+
+    /**
+     * 通知配置
+     */
+    private List<NotifyInfo> notifyList;
+
+}

hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyQueryReqDTO.java

@@ -0,0 +1,37 @@
+package cn.hippo4j.config.model.biz.notify;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Notify query req dto.
+ *
+ * @author chen.ma
+ * @date 2021/11/17 22:52
+ */
+@Data
+public class NotifyQueryReqDTO extends Page {
+
+    /**
+     * groupKeys
+     */
+    private List<String> groupKeys;
+
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
+    /**
+     * 项目id
+     */
+    private String itemId;
+
+    /**
+     * 线程池id
+     */
+    private String tpId;
+
+}

hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyReqDTO.java

@@ -0,0 +1,59 @@
+package cn.hippo4j.config.model.biz.notify;
+
+import lombok.Data;
+
+/**
+ * 消息通知入参实体.
+ *
+ * @author chen.ma
+ * @date 2021/11/18 20:15
+ */
+@Data
+public class NotifyReqDTO {
+
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
+    /**
+     * 项目id
+     */
+    private String itemId;
+
+    /**
+     * 线程池id
+     */
+    private String tpId;
+
+    /**
+     * 通知平台
+     */
+    private String platform;
+
+    /**
+     * 通知类型
+     */
+    private String type;
+
+    /**
+     * 密钥
+     */
+    private String secretKey;
+
+    /**
+     * 报警间隔
+     */
+    private Integer interval;
+
+    /**
+     * 接收者
+     */
+    private String receives;
+
+    /**
+     * 是否启用
+     */
+    private Integer enable;
+
+}

hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyRespDTO.java

@@ -0,0 +1,59 @@
+package cn.hippo4j.config.model.biz.notify;
+
+import lombok.Data;
+
+/**
+ * 消息通知返回.
+ *
+ * @author chen.ma
+ * @date 2021/11/18 20:07
+ */
+@Data
+public class NotifyRespDTO {
+
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
+    /**
+     * 项目id
+     */
+    private String itemId;
+
+    /**
+     * 线程池id
+     */
+    private String tpId;
+
+    /**
+     * 通知平台
+     */
+    private String platform;
+
+    /**
+     * 通知类型
+     */
+    private String type;
+
+    /**
+     * 密钥
+     */
+    private String secretKey;
+
+    /**
+     * 报警间隔
+     */
+    private Integer interval;
+
+    /**
+     * 接收者
+     */
+    private String receives;
+
+    /**
+     * 是否启用
+     */
+    private Integer enable;
+
+}

hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/AlarmService.java

@@ -1,24 +0,0 @@
-package cn.hippo4j.config.service.biz;
-
-import cn.hippo4j.config.model.biz.alarm.AlarmListRespDTO;
-import cn.hippo4j.config.model.biz.alarm.AlarmQueryReqDTO;
-
-import java.util.List;
-
-/**
- * 报警管理.
- *
- * @author chen.ma
- * @date 2021/11/17 22:01
- */
-public interface AlarmService {
-
-    /**
-     * 查询报警配置集合.
-     *
-     * @param reqDTO
-     * @return
-     */
-    List<AlarmListRespDTO> listAlarmConfig(AlarmQueryReqDTO reqDTO);
-
-}

hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/NotifyService.java

@@ -0,0 +1,56 @@
+package cn.hippo4j.config.service.biz;
+
+import cn.hippo4j.config.model.biz.notify.NotifyListRespDTO;
+import cn.hippo4j.config.model.biz.notify.NotifyQueryReqDTO;
+import cn.hippo4j.config.model.biz.notify.NotifyReqDTO;
+import cn.hippo4j.config.model.biz.notify.NotifyRespDTO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 通知管理.
+ *
+ * @author chen.ma
+ * @date 2021/11/17 22:01
+ */
+public interface NotifyService {
+
+    /**
+     * 查询通知配置集合.
+     *
+     * @param reqDTO
+     * @return
+     */
+    List<NotifyListRespDTO> listNotifyConfig(NotifyQueryReqDTO reqDTO);
+
+    /**
+     * 分页查询.
+     *
+     * @param reqDTO
+     * @return
+     */
+    IPage<NotifyRespDTO> queryPage(NotifyQueryReqDTO reqDTO);
+
+    /**
+     * 新增通知配置.
+     *
+     * @param reqDTO
+     */
+    void save(NotifyReqDTO reqDTO);
+
+    /**
+     * 修改通知配置.
+     *
+     * @param reqDTO
+     */
+    void update(NotifyReqDTO reqDTO);
+
+    /**
+     * 删除通知配置.
+     *
+     * @param reqDTO
+     */
+    void delete(NotifyReqDTO reqDTO);
+
+}

hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AlarmServiceImpl.java

@@ -1,48 +0,0 @@
-package cn.hippo4j.config.service.biz.impl;
-
-import cn.hippo4j.common.toolkit.GroupKey;
-import cn.hippo4j.config.mapper.AlarmInfoMapper;
-import cn.hippo4j.config.model.AlarmInfo;
-import cn.hippo4j.config.model.biz.alarm.AlarmListRespDTO;
-import cn.hippo4j.config.model.biz.alarm.AlarmQueryReqDTO;
-import cn.hippo4j.config.service.biz.AlarmService;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 报警管理.
- *
- * @author chen.ma
- * @date 2021/11/17 22:02
- */
-@Service
-@AllArgsConstructor
-public class AlarmServiceImpl implements AlarmService {
-
-    private final AlarmInfoMapper alarmInfoMapper;
-
-    @Override
-    public List<AlarmListRespDTO> listAlarmConfig(AlarmQueryReqDTO reqDTO) {
-        List<AlarmListRespDTO> alarmListRespList = Lists.newArrayList();
-        reqDTO.getGroupKeys().forEach(each -> {
-            String[] parseKey = GroupKey.parseKey(each);
-            LambdaQueryWrapper<AlarmInfo> queryWrapper = Wrappers.lambdaQuery(AlarmInfo.class)
-                    .eq(AlarmInfo::getTenantId, parseKey[2])
-                    .eq(AlarmInfo::getItemId, parseKey[1])
-                    .eq(AlarmInfo::getTpId, parseKey[0]);
-            List<AlarmInfo> alarmInfos = alarmInfoMapper.selectList(queryWrapper);
-            if (CollUtil.isNotEmpty(alarmInfos)) {
-                alarmListRespList.add(new AlarmListRespDTO(parseKey[0], alarmInfos));
-            }
-        });
-
-        return alarmListRespList;
-    }
-
-}

hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/NotifyServiceImpl.java

@@ -0,0 +1,104 @@
+package cn.hippo4j.config.service.biz.impl;
+
+import cn.hippo4j.common.toolkit.GroupKey;
+import cn.hippo4j.config.enums.DelEnum;
+import cn.hippo4j.config.mapper.NotifyInfoMapper;
+import cn.hippo4j.config.model.NotifyInfo;
+import cn.hippo4j.config.model.biz.notify.NotifyListRespDTO;
+import cn.hippo4j.config.model.biz.notify.NotifyQueryReqDTO;
+import cn.hippo4j.config.model.biz.notify.NotifyReqDTO;
+import cn.hippo4j.config.model.biz.notify.NotifyRespDTO;
+import cn.hippo4j.config.service.biz.NotifyService;
+import cn.hippo4j.config.toolkit.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 通知管理.
+ *
+ * @author chen.ma
+ * @date 2021/11/17 22:02
+ */
+@Service
+@AllArgsConstructor
+public class NotifyServiceImpl implements NotifyService {
+
+    private final NotifyInfoMapper notifyInfoMapper;
+
+    @Override
+    public List<NotifyListRespDTO> listNotifyConfig(NotifyQueryReqDTO reqDTO) {
+        List<NotifyListRespDTO> notifyListRespList = Lists.newArrayList();
+        reqDTO.getGroupKeys().forEach(each -> {
+            String[] parseKey = GroupKey.parseKey(each);
+            List<NotifyInfo> notifyInfos = listNotifyCommon("CONFIG", parseKey);
+            if (CollUtil.isNotEmpty(notifyInfos)) {
+                notifyListRespList.add(new NotifyListRespDTO(StrUtil.builder(parseKey[0], "+", "CONFIG").toString(), notifyInfos));
+            }
+
+            List<NotifyInfo> alarmInfos = listNotifyCommon("ALARM", parseKey);
+            if (CollUtil.isNotEmpty(alarmInfos)) {
+                notifyListRespList.add(new NotifyListRespDTO(StrUtil.builder(parseKey[0], "+", "ALARM").toString(), alarmInfos));
+            }
+        });
+
+        return notifyListRespList;
+    }
+
+    @Override
+    public IPage<NotifyRespDTO> queryPage(NotifyQueryReqDTO reqDTO) {
+        LambdaQueryWrapper<NotifyInfo> queryWrapper = Wrappers.lambdaQuery(NotifyInfo.class)
+                .eq(StrUtil.isNotBlank(reqDTO.getTenantId()), NotifyInfo::getTenantId, reqDTO.getTenantId())
+                .eq(StrUtil.isNotBlank(reqDTO.getItemId()), NotifyInfo::getItemId, reqDTO.getItemId())
+                .eq(StrUtil.isNotBlank(reqDTO.getTpId()), NotifyInfo::getTpId, reqDTO.getTpId());
+
+        IPage<NotifyInfo> resultPage = notifyInfoMapper.selectPage(reqDTO, queryWrapper);
+        return resultPage.convert(each -> BeanUtil.convert(each, NotifyRespDTO.class));
+    }
+
+    @Override
+    public void save(NotifyReqDTO reqDTO) {
+        notifyInfoMapper.insert(BeanUtil.convert(reqDTO, NotifyInfo.class));
+    }
+
+    @Override
+    public void update(NotifyReqDTO reqDTO) {
+        NotifyInfo notifyInfo = BeanUtil.convert(reqDTO, NotifyInfo.class);
+        LambdaUpdateWrapper<NotifyInfo> updateWrapper = Wrappers.lambdaUpdate(NotifyInfo.class)
+                .eq(NotifyInfo::getTenantId, reqDTO.getTenantId())
+                .eq(NotifyInfo::getItemId, reqDTO.getItemId())
+                .eq(NotifyInfo::getTpId, reqDTO.getTpId());
+
+        notifyInfoMapper.update(notifyInfo, updateWrapper);
+    }
+
+    @Override
+    public void delete(NotifyReqDTO reqDTO) {
+        LambdaUpdateWrapper<NotifyInfo> updateWrapper = Wrappers.lambdaUpdate(NotifyInfo.class)
+                .eq(NotifyInfo::getTenantId, reqDTO.getTenantId())
+                .eq(NotifyInfo::getItemId, reqDTO.getItemId())
+                .eq(NotifyInfo::getTpId, reqDTO.getTpId());
+
+        notifyInfoMapper.delete(updateWrapper);
+    }
+
+    private List<NotifyInfo> listNotifyCommon(String type, String[] parseKey) {
+        LambdaQueryWrapper<NotifyInfo> queryWrapper = Wrappers.lambdaQuery(NotifyInfo.class)
+                .eq(NotifyInfo::getTenantId, parseKey[2])
+                .eq(NotifyInfo::getItemId, parseKey[1])
+                .eq(NotifyInfo::getTpId, parseKey[0])
+                .eq(NotifyInfo::getEnable, DelEnum.NORMAL)
+                .eq(NotifyInfo::getType, type);
+        List<NotifyInfo> notifyInfos = notifyInfoMapper.selectList(queryWrapper);
+        return notifyInfos;
+    }
+
+}

hippo4j-console/src/main/java/cn/hippo4j/console/controller/AlarmController.java

@@ -1,36 +0,0 @@
-package cn.hippo4j.console.controller;
-
-import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
-import cn.hippo4j.config.model.biz.alarm.AlarmListRespDTO;
-import cn.hippo4j.config.model.biz.alarm.AlarmQueryReqDTO;
-import cn.hippo4j.config.service.biz.AlarmService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 报警管理.
- *
- * @author chen.ma
- * @date 2021/11/17 22:00
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping(Constants.BASE_PATH + "/alarm")
-public class AlarmController {
-
-    private final AlarmService alarmService;
-
-    @PostMapping("/list/config")
-    public Result<List<AlarmListRespDTO>> listAlarmConfig(@RequestBody AlarmQueryReqDTO reqDTO) {
-        List<AlarmListRespDTO> resultData = alarmService.listAlarmConfig(reqDTO);
-        return Results.success(resultData);
-    }
-
-}

hippo4j-console/src/main/java/cn/hippo4j/console/controller/NotifyController.java

@@ -0,0 +1,60 @@
+package cn.hippo4j.console.controller;
+
+import cn.hippo4j.common.constant.Constants;
+import cn.hippo4j.common.web.base.Result;
+import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.config.model.biz.notify.NotifyListRespDTO;
+import cn.hippo4j.config.model.biz.notify.NotifyQueryReqDTO;
+import cn.hippo4j.config.model.biz.notify.NotifyReqDTO;
+import cn.hippo4j.config.model.biz.notify.NotifyRespDTO;
+import cn.hippo4j.config.service.biz.NotifyService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 通知管理.
+ *
+ * @author chen.ma
+ * @date 2021/11/17 22:00
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping(Constants.BASE_PATH + "/notify")
+public class NotifyController {
+
+    private final NotifyService notifyService;
+
+    @PostMapping("/list/config")
+    public Result<List<NotifyListRespDTO>> listNotifyConfig(@RequestBody NotifyQueryReqDTO reqDTO) {
+        List<NotifyListRespDTO> resultData = notifyService.listNotifyConfig(reqDTO);
+        return Results.success(resultData);
+    }
+
+    @PostMapping("/query/page")
+    public Result<IPage<NotifyRespDTO>> queryPage(@RequestBody NotifyQueryReqDTO reqDTO) {
+        IPage<NotifyRespDTO> resultPage = notifyService.queryPage(reqDTO);
+        return Results.success(resultPage);
+    }
+
+    @PostMapping("/save")
+    public Result<Void> saveNotifyConfig(@RequestBody NotifyReqDTO reqDTO) {
+        notifyService.save(reqDTO);
+        return Results.success();
+    }
+
+    @PostMapping("/update")
+    public Result<Void> updateNotifyConfig(@RequestBody NotifyReqDTO reqDTO) {
+        notifyService.update(reqDTO);
+        return Results.success();
+    }
+
+    @DeleteMapping("/remove")
+    public Result<Void> removeNotifyConfig(@RequestBody NotifyReqDTO reqDTO) {
+        notifyService.delete(reqDTO);
+        return Results.success();
+    }
+
+}

hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/AlarmControlDTO.java

@@ -1,5 +1,6 @@
 package cn.hippo4j.starter.alarm;
 
+import cn.hutool.core.util.StrUtil;
 import lombok.Builder;
 import lombok.Data;
 
@@ -18,6 +19,11 @@ public class AlarmControlDTO {
      */
     private String threadPool;
 
+    /**
+     * 推送报警平台
+     */
+    private String platform;
+
     /**
      * 推送报警类型
      */
@@ -29,7 +35,7 @@ public class AlarmControlDTO {
      * @return
      */
     public String buildPk() {
-        return threadPool + "_" + typeEnum;
+        return StrUtil.builder(threadPool, "+", platform).toString();
     }
 
 }

hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/AlarmControlHandler.java

@@ -2,10 +2,11 @@ package cn.hippo4j.starter.alarm;
 
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.Maps;
 
-import java.util.concurrent.TimeUnit;
+import java.util.Map;
 
 /**
  * 报警控制组件.
@@ -15,13 +16,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class AlarmControlHandler {
 
-    private final Cache<String, String> cache;
+    public static Map<String, Cache<String, String>> THREAD_POOL_ALARM_CACHE = Maps.newConcurrentMap();
-
-    public AlarmControlHandler(long alarmInterval) {
-        cache = CacheBuilder.newBuilder()
-                .expireAfterWrite(alarmInterval, TimeUnit.MINUTES)
-                .build();
-    }
 
     /**
      * 控制消息推送报警频率.
@@ -29,13 +24,17 @@ public class AlarmControlHandler {
      * @param alarmControl
      * @return
      */
-    public boolean isSend(AlarmControlDTO alarmControl) {
+    public boolean isSendAlarm(AlarmControlDTO alarmControl) {
-        String pkId = cache.getIfPresent(alarmControl.buildPk());
+        Cache<String, String> cache = THREAD_POOL_ALARM_CACHE.get(alarmControl.buildPk());
-
+        if (cache != null) {
+            String pkId = cache.getIfPresent(alarmControl.getTypeEnum().name());
             if (StrUtil.isBlank(pkId)) {
                 // val 无意义
-            cache.put(alarmControl.buildPk(), IdUtil.simpleUUID());
+                cache.put(alarmControl.getTypeEnum().name(), IdUtil.simpleUUID());
                 return true;
+            } else {
+                System.out.println(JSON.toJSONString(alarmControl));
+            }
         }
 
         return false;

hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/BaseSendMessageService.java

@@ -9,7 +9,10 @@ import cn.hippo4j.starter.core.DynamicThreadPoolExecutor;
 import cn.hippo4j.starter.core.GlobalThreadPoolManage;
 import cn.hippo4j.starter.remote.HttpAgent;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.AllArgsConstructor;
@@ -21,6 +24,7 @@ import org.springframework.beans.factory.InitializingBean;
 
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Base send message service.
@@ -38,14 +42,17 @@ public class BaseSendMessageService implements InitializingBean, SendMessageServ
     @NonNull
     private final BootstrapProperties properties;
 
-    private final static Map<String, List<AlarmNotifyDTO>> ALARM_NOTIFY_CONFIG = Maps.newHashMap();
+    @NonNull
+    private final AlarmControlHandler alarmControlHandler;
 
+    public final static Map<String, List<NotifyDTO>> ALARM_NOTIFY_CONFIG = Maps.newHashMap();
 
     private final Map<String, SendMessageHandler> sendMessageHandlers = Maps.newHashMap();
 
     @Override
-    public void sendAlarmMessage(DynamicThreadPoolExecutor threadPoolExecutor) {
+    public void sendAlarmMessage(MessageTypeEnum typeEnum, DynamicThreadPoolExecutor executor) {
-        List<AlarmNotifyDTO> notifyList = ALARM_NOTIFY_CONFIG.get(threadPoolExecutor.getThreadPoolId());
+        String buildKey = StrUtil.builder(executor.getThreadPoolId(), "+", "ALARM").toString();
+        List<NotifyDTO> notifyList = ALARM_NOTIFY_CONFIG.get(buildKey);
         if (CollUtil.isEmpty(notifyList)) {
             log.warn("Please configure alarm notification on the server.");
             return;
@@ -59,7 +66,9 @@ public class BaseSendMessageService implements InitializingBean, SendMessageServ
                     return;
                 }
 
-                messageHandler.sendAlarmMessage(each, threadPoolExecutor);
+                if (isSendAlarm(each.getTpId(), each.setTypeEnum(typeEnum))) {
+                    messageHandler.sendAlarmMessage(each, executor);
+                }
             } catch (Exception ex) {
                 log.warn("Failed to send thread pool alarm notification.", ex);
             }
@@ -68,7 +77,8 @@ public class BaseSendMessageService implements InitializingBean, SendMessageServ
 
     @Override
     public void sendChangeMessage(PoolParameterInfo parameter) {
-        List<AlarmNotifyDTO> notifyList = ALARM_NOTIFY_CONFIG.get(parameter.getTpId());
+        String buildKey = StrUtil.builder(parameter.getTpId(), "+", "CONFIG").toString();
+        List<NotifyDTO> notifyList = ALARM_NOTIFY_CONFIG.get(buildKey);
         if (CollUtil.isEmpty(notifyList)) {
             log.warn("Please configure alarm notification on the server.");
             return;
@@ -109,22 +119,41 @@ public class BaseSendMessageService implements InitializingBean, SendMessageServ
 
         Result result = null;
         try {
-            result = httpAgent.httpPostByDiscovery("/v1/cs/alarm/list/config", new ThreadPoolAlarmReqDTO(groupKeys));
+            result = httpAgent.httpPostByDiscovery("/v1/cs/notify/list/config", new ThreadPoolNotifyReqDTO(groupKeys));
         } catch (Throwable ex) {
-            log.error("Get dynamic thread pool alarm configuration error.", ex);
+            log.error("Get dynamic thread pool notify configuration error.", ex);
-            throw ex;
         }
 
-        if (result.isSuccess() || result.getData() != null) {
+        if (result != null && result.isSuccess() && result.getData() != null) {
             String resultDataStr = JSON.toJSONString(result.getData());
-            List<ThreadPoolAlarmNotify> resultData = JSON.parseArray(resultDataStr, ThreadPoolAlarmNotify.class);
+            List<ThreadPoolNotify> resultData = JSON.parseArray(resultDataStr, ThreadPoolNotify.class);
-            resultData.forEach(each -> ALARM_NOTIFY_CONFIG.put(each.getThreadPoolId(), each.getAlarmNotifyList()));
+            resultData.forEach(each -> ALARM_NOTIFY_CONFIG.put(each.getNotifyKey(), each.getNotifyList()));
+
+            ALARM_NOTIFY_CONFIG.forEach((key, val) ->
+                    val.stream().filter(each -> StrUtil.equals("ALARM", each.getType()))
+                            .forEach(each -> {
+                                Cache<String, String> cache = CacheBuilder.newBuilder()
+                                        .expireAfterWrite(each.getInterval(), TimeUnit.MINUTES)
+                                        .build();
+                                AlarmControlHandler.THREAD_POOL_ALARM_CACHE.put(StrUtil.builder(each.getTpId(), "+", each.getPlatform()).toString(), cache);
+                            })
+            );
+        }
     }
+
+    private boolean isSendAlarm(String threadPoolId, NotifyDTO notifyInfo) {
+        AlarmControlDTO alarmControl = AlarmControlDTO.builder()
+                .threadPool(threadPoolId)
+                .platform(notifyInfo.getPlatform())
+                .typeEnum(notifyInfo.getTypeEnum())
+                .build();
+
+        return alarmControlHandler.isSendAlarm(alarmControl);
     }
 
     @Data
     @AllArgsConstructor
-    static class ThreadPoolAlarmReqDTO {
+    static class ThreadPoolNotifyReqDTO {
 
         /**
          * groupKeys
@@ -134,17 +163,17 @@ public class BaseSendMessageService implements InitializingBean, SendMessageServ
     }
 
     @Data
-    static class ThreadPoolAlarmNotify {
+    static class ThreadPoolNotify {
 
         /**
-         * 线程池ID
+         * 通知 Key
          */
-        private String threadPoolId;
+        private String notifyKey;
 
         /**
          * 报警配置
          */
-        private List<AlarmNotifyDTO> alarmNotifyList;
+        private List<NotifyDTO> notifyList;
 
     }
 

hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/DingSendMessageHandler.java

@@ -37,20 +37,20 @@ public class DingSendMessageHandler implements SendMessageHandler {
 
     @Override
     public String getType() {
-        return SendMessageEnum.DING.name();
+        return NotifyPlatformEnum.DING.name();
     }
 
     @Override
-    public void sendAlarmMessage(AlarmNotifyDTO notifyConfig, DynamicThreadPoolExecutor pool) {
+    public void sendAlarmMessage(NotifyDTO notifyConfig, DynamicThreadPoolExecutor pool) {
         dingAlarmSendMessage(notifyConfig, pool);
     }
 
     @Override
-    public void sendChangeMessage(AlarmNotifyDTO notifyConfig, PoolParameterInfo parameter) {
+    public void sendChangeMessage(NotifyDTO notifyConfig, PoolParameterInfo parameter) {
         dingChangeSendMessage(notifyConfig, parameter);
     }
 
-    private void dingAlarmSendMessage(AlarmNotifyDTO notifyConfig, DynamicThreadPoolExecutor pool) {
+    private void dingAlarmSendMessage(NotifyDTO notifyConfig, DynamicThreadPoolExecutor pool) {
         List<String> receives = StrUtil.split(notifyConfig.getReceives(), ',');
         String afterReceives = Joiner.on(", @").join(receives);
 
@@ -61,6 +61,7 @@ public class DingSendMessageHandler implements SendMessageHandler {
                         "<font color='#708090' size=2>线程池ID：%s</font> \n\n " +
                         "<font color='#708090' size=2>应用名称：%s</font> \n\n " +
                         "<font color='#778899' size=2>应用实例：%s</font> \n\n " +
+                        "<font color='#778899' size=2>报警类型：%s</font> \n\n " +
                         " --- \n\n  " +
                         "<font color='#708090' size=2>核心线程数：%d</font> \n\n " +
                         "<font color='#708090' size=2>最大线程数：%d</font> \n\n " +
@@ -89,6 +90,8 @@ public class DingSendMessageHandler implements SendMessageHandler {
                 instanceInfo.getAppName(),
                 // 实例信息
                 instanceInfo.getIdentify(),
+                // 报警类型
+                notifyConfig.getTypeEnum(),
                 // 核心线程数
                 pool.getCorePoolSize(),
                 // 最大线程数
@@ -124,7 +127,7 @@ public class DingSendMessageHandler implements SendMessageHandler {
         execute(notifyConfig, "动态线程池告警", text, receives);
     }
 
-    private void dingChangeSendMessage(AlarmNotifyDTO notifyConfig, PoolParameterInfo parameter) {
+    private void dingChangeSendMessage(NotifyDTO notifyConfig, PoolParameterInfo parameter) {
         String threadPoolId = parameter.getTpId();
         DynamicThreadPoolWrapper poolWrap = GlobalThreadPoolManage.getExecutorService(threadPoolId);
         if (poolWrap == null) {
@@ -190,7 +193,7 @@ public class DingSendMessageHandler implements SendMessageHandler {
         execute(notifyConfig, "动态线程池通知", text, receives);
     }
 
-    private void execute(AlarmNotifyDTO notifyConfig, String title, String text, List<String> mobiles) {
+    private void execute(NotifyDTO notifyConfig, String title, String text, List<String> mobiles) {
         String url = "https://oapi.dingtalk.com/robot/send?access_token=";
         String serverUrl = url + notifyConfig.getSecretKey();
         DingTalkClient dingTalkClient = new DefaultDingTalkClient(serverUrl);

hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/NotifyDTO.java

@@ -1,15 +1,17 @@
 package cn.hippo4j.starter.alarm;
 
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 /**
- * 报警通知实体.
+ * 通知实体.
  *
  * @author chen.ma
  * @date 2021/11/17 22:12
  */
 @Data
-public class AlarmNotifyDTO {
+@Accessors(chain = true)
+public class NotifyDTO {
 
     /**
      * 租户id
@@ -31,6 +33,11 @@ public class AlarmNotifyDTO {
      */
     private String platform;
 
+    /**
+     * 通知类型
+     */
+    private String type;
+
     /**
      * 密钥
      */
@@ -46,4 +53,9 @@ public class AlarmNotifyDTO {
      */
     private String receives;
 
+    /**
+     * 报警类型
+     */
+    private MessageTypeEnum typeEnum;
+
 }

hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/NotifyPlatformEnum.java

@@ -1,12 +1,12 @@
 package cn.hippo4j.starter.alarm;
 
 /**
- * Send message enum.
+ * Notify platform enum.
  *
  * @author chen.ma
  * @date 2021/8/15 15:50
  */
-public enum SendMessageEnum {
+public enum NotifyPlatformEnum {
 
     DING
 

hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/SendMessageHandler.java

@@ -24,7 +24,7 @@ public interface SendMessageHandler {
      * @param notifyConfig
      * @param threadPoolExecutor
      */
-    void sendAlarmMessage(AlarmNotifyDTO notifyConfig, DynamicThreadPoolExecutor threadPoolExecutor);
+    void sendAlarmMessage(NotifyDTO notifyConfig, DynamicThreadPoolExecutor threadPoolExecutor);
 
     /**
      * Send change message.
@@ -32,6 +32,6 @@ public interface SendMessageHandler {
      * @param notifyConfig
      * @param parameter
      */
-    void sendChangeMessage(AlarmNotifyDTO notifyConfig, PoolParameterInfo parameter);
+    void sendChangeMessage(NotifyDTO notifyConfig, PoolParameterInfo parameter);
 
 }

hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/SendMessageService.java

@@ -14,9 +14,10 @@ public interface SendMessageService {
     /**
      * Send alarm message.
      *
+     * @param typeEnum
      * @param threadPoolExecutor
      */
-    void sendAlarmMessage(DynamicThreadPoolExecutor threadPoolExecutor);
+    void sendAlarmMessage(MessageTypeEnum typeEnum, DynamicThreadPoolExecutor threadPoolExecutor);
 
     /**
      * Send change message.

hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/ThreadPoolAlarmManage.java

@@ -5,10 +5,10 @@ import cn.hippo4j.common.model.PoolParameterInfo;
 import cn.hippo4j.starter.config.MessageAlarmConfig;
 import cn.hippo4j.starter.core.DynamicThreadPoolExecutor;
 import cn.hippo4j.starter.toolkit.CalculateUtil;
-import cn.hippo4j.starter.toolkit.thread.ResizableCapacityLinkedBlockIngQueue;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Optional;
+import java.util.concurrent.BlockingQueue;
 
 /**
  * Alarm manage.
@@ -24,19 +24,11 @@ public class ThreadPoolAlarmManage {
      */
     private static final SendMessageService SEND_MESSAGE_SERVICE;
 
-    /**
-     * 报警间隔控制
-     */
-    private static final AlarmControlHandler ALARM_CONTROL_HANDLER;
-
     static {
         SEND_MESSAGE_SERVICE = Optional.ofNullable(ApplicationContextHolder.getInstance())
                 .map(each -> each.getBean(MessageAlarmConfig.SEND_MESSAGE_BEAN_NAME, SendMessageService.class))
                 .orElse(null);
-
+        System.out.println();
-        ALARM_CONTROL_HANDLER = Optional.ofNullable(ApplicationContextHolder.getInstance())
-                .map(each -> each.getBean(AlarmControlHandler.class))
-                .orElse(null);
     }
 
     /**
@@ -49,16 +41,16 @@ public class ThreadPoolAlarmManage {
             return;
         }
         ThreadPoolAlarm threadPoolAlarm = threadPoolExecutor.getThreadPoolAlarm();
-        ResizableCapacityLinkedBlockIngQueue blockIngQueue =
+        BlockingQueue blockIngQueue = threadPoolExecutor.getQueue();
-                (ResizableCapacityLinkedBlockIngQueue) threadPoolExecutor.getQueue();
 
         int queueSize = blockIngQueue.size();
         int capacity = queueSize + blockIngQueue.remainingCapacity();
         int divide = CalculateUtil.divide(queueSize, capacity);
-        boolean isSend = divide > threadPoolAlarm.getCapacityAlarm()
+        boolean isSend = threadPoolAlarm.getIsAlarm()
+                && divide > threadPoolAlarm.getCapacityAlarm()
                 && isSendMessage(threadPoolExecutor, MessageTypeEnum.CAPACITY);
         if (isSend) {
-            SEND_MESSAGE_SERVICE.sendAlarmMessage(threadPoolExecutor);
+            SEND_MESSAGE_SERVICE.sendAlarmMessage(MessageTypeEnum.CAPACITY, threadPoolExecutor);
         }
     }
 
@@ -76,10 +68,13 @@ public class ThreadPoolAlarmManage {
         int maximumPoolSize = threadPoolExecutor.getMaximumPoolSize();
         int divide = CalculateUtil.divide(activeCount, maximumPoolSize);
 
-        boolean isSend = divide > threadPoolExecutor.getThreadPoolAlarm().getLivenessAlarm()
+        ThreadPoolAlarm threadPoolAlarm = threadPoolExecutor.getThreadPoolAlarm();
+
+        boolean isSend = threadPoolAlarm.getIsAlarm()
+                && divide > threadPoolAlarm.getLivenessAlarm()
                 && isSendMessage(threadPoolExecutor, MessageTypeEnum.CAPACITY);
         if (isSend) {
-            SEND_MESSAGE_SERVICE.sendAlarmMessage(threadPoolExecutor);
+            SEND_MESSAGE_SERVICE.sendAlarmMessage(MessageTypeEnum.CAPACITY, threadPoolExecutor);
         }
     }
 
@@ -93,8 +88,9 @@ public class ThreadPoolAlarmManage {
             return;
         }
 
-        if (isSendMessage(threadPoolExecutor, MessageTypeEnum.REJECT)) {
+        ThreadPoolAlarm threadPoolAlarm = threadPoolExecutor.getThreadPoolAlarm();
-            SEND_MESSAGE_SERVICE.sendAlarmMessage(threadPoolExecutor);
+        if (threadPoolAlarm.getIsAlarm() && isSendMessage(threadPoolExecutor, MessageTypeEnum.REJECT)) {
+            SEND_MESSAGE_SERVICE.sendAlarmMessage(MessageTypeEnum.REJECT, threadPoolExecutor);
         }
     }
 
@@ -119,11 +115,8 @@ public class ThreadPoolAlarmManage {
      * @return
      */
     private static boolean isSendMessage(DynamicThreadPoolExecutor threadPoolExecutor, MessageTypeEnum typeEnum) {
-        AlarmControlDTO alarmControl = AlarmControlDTO.builder()
+        // ignore
-                .threadPool(threadPoolExecutor.getThreadPoolId())
+        return true;
-                .typeEnum(typeEnum)
-                .build();
-        return ALARM_CONTROL_HANDLER.isSend(alarmControl);
     }
 
 }

hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/MessageAlarmConfig.java

@@ -28,8 +28,8 @@ public class MessageAlarmConfig {
 
     @DependsOn("applicationContextHolder")
     @Bean(MessageAlarmConfig.SEND_MESSAGE_BEAN_NAME)
-    public SendMessageService sendMessageService(HttpAgent httpAgent) {
+    public SendMessageService sendMessageService(HttpAgent httpAgent, AlarmControlHandler alarmControlHandler) {
-        return new BaseSendMessageService(httpAgent, properties);
+        return new BaseSendMessageService(httpAgent, properties, alarmControlHandler);
     }
 
     @Bean
@@ -40,8 +40,7 @@ public class MessageAlarmConfig {
 
     @Bean
     public AlarmControlHandler alarmControlHandler() {
-        Long alarmInterval = properties.getAlarmInterval();
+        return new AlarmControlHandler();
-        return new AlarmControlHandler(alarmInterval);
     }
 
 }