Merge branch 'feature-918' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/CheckQywxSettingApiServiceImpl.java

@@ -134,19 +134,20 @@ public class CheckQywxSettingApiServiceImpl implements CheckQywxSettingApiServic
         if (null == messageDTO) {
             return;
         }
+        boolean alertFlag = false;
         if (messageDTO.getAlertType().equals(AlertTypeEnum.ES_BID_PAGE.getType())) {
             Object limit = RedisUtil.getCache("es_bid_page_limit");
             if (null != limit) {
                 Integer begin = Integer.valueOf(messageDTO.getContentMap().get("begin").toString());
                 if (begin.intValue() < Integer.valueOf(limit.toString())) {
                     logger.info("没到阈值，无需告警");
-                    return;
+                    alertFlag = true;
                 }
             }
         }
         //告警是否拦截重复告警 防止批量触发
         if (StringUtils.isNotBlank(messageDTO.getKey())) {
-            String key = messageDTO.getKey() + messageDTO.getAlertType();
+            String key = messageDTO.getKey() + messageDTO.getAlertType() + alertFlag;
             RBucket<Object> bucket = RedisUtil.getRedisClient().getBucket(key);
             boolean b = bucket.trySet(1, 60L, TimeUnit.SECONDS);
             if (!b) {
@@ -168,6 +169,9 @@ public class CheckQywxSettingApiServiceImpl implements CheckQywxSettingApiServic
             if (anEnum.getDingUrl() != null) {
                 dingUrl = anEnum.getDingUrl();
             }
+            if (alertFlag) {
+                dingUrl = ALERT_URL;
+            }
         } else {
             markdownMap.put("title", messageDTO.getAlertTitle());
             text += "标题：" + messageDTO.getAlertTitle() + "\n\r";