hanzhiwei лет назад: 2
Родитель
Сommit
864b3a68cf

+ 6 - 3
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/RedisExpiredPhotographListener.java

@@ -167,11 +167,14 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
 
 
                 StringBuffer userIds = new StringBuffer();
                 StringBuffer userIds = new StringBuffer();
                 StringBuffer phones = new StringBuffer();
                 StringBuffer phones = new StringBuffer();
-                if (!redisService.hasKey(key)) {
+                //查询配置
+                WarningConfig warningConfig = warningConfigService.getOne(new LambdaQueryWrapper<WarningConfig>().eq(WarningConfig::getWarningType, 1));
+                Integer anomalyCount = warningConfig.getAnomalyCount();
+                String lastKey = key.substring(0,key.lastIndexOf("~")) + (anomalyCount - 1);
+                log.info("lastKey = {}",lastKey);
+                if (!redisService.hasKey(lastKey)) {
                     log.info("进入最后一次循环!");
                     log.info("进入最后一次循环!");
                     //如果没有这个key了 则统计异常率
                     //如果没有这个key了 则统计异常率
-                    //查询配置
-                    WarningConfig warningConfig = warningConfigService.getOne(new LambdaQueryWrapper<WarningConfig>().eq(WarningConfig::getWarningType, 1));
                     List<WarningDetail> list = warningDetailService.list(new LambdaQueryWrapper<WarningDetail>().eq(WarningDetail::getLogId, warningNoticeLog.getId()));
                     List<WarningDetail> list = warningDetailService.list(new LambdaQueryWrapper<WarningDetail>().eq(WarningDetail::getLogId, warningNoticeLog.getId()));
                     if (list.size() > 0) {
                     if (list.size() > 0) {
                         List<WarningDetail> collect = list.stream().filter(i -> i.getResult() == true).collect(Collectors.toList());
                         List<WarningDetail> collect = list.stream().filter(i -> i.getResult() == true).collect(Collectors.toList());