报警次数大于等于预设值时均报警

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

@@ -220,7 +220,7 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                     //系统 短信 语音通知
                     long systemNoticeCount = warningNoticeLogService.count(new LambdaQueryWrapper<WarningNoticeLog>().eq(WarningNoticeLog::getSubId, warningNoticeLog.getSubId())
                             .eq(WarningNoticeLog::getWarningType,1).like(WarningNoticeLog::getWarningWay,"1").eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE));
-                    if (warningConfig.getSystemNotice() != null && systemNoticeCount == warningConfig.getSystemNotice()) {
+                    if (warningConfig.getSystemNotice() != null && systemNoticeCount >= warningConfig.getSystemNotice()) {
                         //系统通知
                         LabMessageContent labMessageContent = new LabMessageContent();
                         labMessageContent.setSendMode(2);
@@ -234,7 +234,7 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                     }
                     long messageNoticeCount = warningNoticeLogService.count(new LambdaQueryWrapper<WarningNoticeLog>().eq(WarningNoticeLog::getSubId, warningNoticeLog.getSubId())
                             .eq(WarningNoticeLog::getWarningType,1).like(WarningNoticeLog::getWarningWay,"2").eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE));
-                    if (warningConfig.getMessageNotice() != null && messageNoticeCount == warningConfig.getMessageNotice()) {
+                    if (warningConfig.getMessageNotice() != null && messageNoticeCount >= warningConfig.getMessageNotice()) {
                         //短信通知
                         String[] strings = Stream.of(phones.toString().split(",")).filter(a -> StrUtil.isNotBlank(a)).collect(Collectors.joining(",")).split(",");
                         if (strings != null) {
@@ -246,7 +246,7 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                     }
                     long voiceNoticeCount = warningNoticeLogService.count(new LambdaQueryWrapper<WarningNoticeLog>().eq(WarningNoticeLog::getSubId, warningNoticeLog.getSubId())
                             .eq(WarningNoticeLog::getWarningType,1).like(WarningNoticeLog::getWarningWay,"3").eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE));
-                    if (warningConfig.getVoiceNotcie() != null && voiceNoticeCount == warningConfig.getVoiceNotcie()) {
+                    if (warningConfig.getVoiceNotcie() != null && voiceNoticeCount >= warningConfig.getVoiceNotcie()) {
                         //语音播报
                         log.info("打开喇叭-远程调用查询喇叭列表，实验室id={}", warningNoticeLog.getSubId());
                         Integer count = labSparseHardwareService.selectSpeakerCount();