未穿戴实验服修改

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

@@ -198,6 +198,7 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                                 warningNoticeLogDto.setFloorId(i.getFloorId());
                                 warningNoticeLogDto.setFloorName(i.getFloorName());
                                 warningNoticeLogDto.setRoomNum(i.getRoomNumber());
+//                                warningNoticeLogDto.setWarningWay("1,2,3");
                                 warningNoticeLogDto.setUpdateTime(LocalDateTime.now());
                                 warningNoticeLogDto.setIsDeleted(Boolean.FALSE);
                                 userIds.append(i.getSafeUserId()).append(",").append(i.getAdminId());
@@ -219,8 +220,9 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                             WarningNoticeLogDto warningNoticeLogDto2 = new WarningNoticeLogDto();
                             //系统 短信 语音通知
                             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()) {
+                                    .eq(WarningNoticeLog::getWarningType,1).eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE));
+                            long l = systemNoticeCount % warningConfig.getSystemNotice();
+                            if (warningConfig.getSystemNotice() != null && l == warningConfig.getSystemNotice()) {
                                 //系统通知
                                 warningWay.append("1,");
                                 LabMessageContent labMessageContent = new LabMessageContent();
@@ -234,8 +236,9 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                                 labMessageContentService.sendMessage(labMessageContent);
                             }
                             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()) {
+                                    .eq(WarningNoticeLog::getWarningType,1).eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE));
+                            long l1 = messageNoticeCount % warningConfig.getMessageNotice();
+                            if (warningConfig.getMessageNotice() != null && l1 == warningConfig.getMessageNotice()) {
                                 //短信通知
                                 warningWay.append("2,");
                                 String[] strings = Stream.of(phones.toString().split(",")).filter(a -> StrUtil.isNotBlank(a)).collect(Collectors.joining(",")).split(",");
@@ -247,9 +250,9 @@ 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()) {
-                                //
+                                    .eq(WarningNoticeLog::getWarningType,1).eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE));
+                            long l2 = voiceNoticeCount % warningConfig.getVoiceNotcie();
+                            if (warningConfig.getVoiceNotcie() != null && l2 == warningConfig.getVoiceNotcie()) {
                                 warningWay.append("3,");
                                 warningNoticeLogDto2.setVoiceBroadcast(1);
                                 log.info("打开喇叭-远程调用查询喇叭列表，实验室id={}", warningNoticeLog.getSubId());
@@ -278,11 +281,13 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                                     log.info("打开喇叭-远程调用喇叭播放音乐返回信息：{}", JSON.toJSONString(r));
                                 }
                             }
-                            warningNoticeLogDto2.setId(warningNoticeLog.getId());
-                            warningNoticeLogDto2.setWarningWay(warningWay.toString());
-                            ResultData updateResult = remoteLaboratoryService.updateWarningNoticeLog(warningNoticeLogDto2);
-                            if (HttpStatus.SUCCESS == updateResult.getCode()) {
-                                log.info("未穿戴实验服修改报警方式日志成功！");
+                            if(StringUtils.isNotBlank(warningWay)){
+                                warningNoticeLogDto2.setId(warningNoticeLog.getId());
+                                warningNoticeLogDto2.setWarningWay(warningWay.toString());
+                                ResultData updateResult = remoteLaboratoryService.updateWarningNoticeLog(warningNoticeLogDto2);
+                                if (HttpStatus.SUCCESS == updateResult.getCode()) {
+                                    log.info("未穿戴实验服修改报警方式日志成功！");
+                                }
                             }
                         }
                     }