Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/monitor/BusinessEmergent110ServiceImpl.java

@@ -9,6 +9,7 @@


import org.springframework.stereotype.Service;



import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;

import com.yeshi.fanli.util.EmergencyUtil;

@@ -50,8 +51,8 @@
      if (!exist)

         stList.add(identifyCode);

      if (stList.size() >= limitCount) {// 触发报警

         if ("1".equalsIgnoreCase(configService.get("can_send_emergency_msg")))

            EmergencyUtil.baoJin(key, "返利券【分享赚】", phones);

         if ("1".equalsIgnoreCase(configService.get(ConfigKeyEnum.canSendEmergencyMsg.getKey())))

            EmergencyUtil.baoJin(key, "板栗快省【分享赚】", phones);

      }

   }



@@ -80,8 +81,8 @@
      if (!exist)

         stList.add(identifyCode);

      if (stList.size() >= limitCount) {// 触发报警

         if ("1".equalsIgnoreCase(configService.get("can_send_emergency_msg")))

            EmergencyUtil.baoJin(key, "返利券【领券返利】", phones);

         if ("1".equalsIgnoreCase(configService.get(ConfigKeyEnum.canSendEmergencyMsg.getKey())))

            EmergencyUtil.baoJin(key, "板栗快省【领券返利】", phones);

      }

   }



@@ -110,7 +111,7 @@
      if (!exist)

         stList.add(identifyCode);

      if (stList.size() >= limitCount) {// 触发报警

         if ("1".equalsIgnoreCase(configService.get("can_send_emergency_msg")))

         if ("1".equalsIgnoreCase(configService.get(ConfigKeyEnum.canSendEmergencyMsg.getKey())))

            EmergencyUtil.baoJin(key, "淘宝APPKey请求限制【" + appKey + "】", phones);

      }

   }