优化

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

@@ -198,7 +198,6 @@ 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,10 +218,10 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                             String text = "【实验室安全系统】"+warningNoticeLog.getSubName()+"-监测到实验人员违规未穿戴实验服，请尽快确认。点击查看：https://lab.zjznai.com/labAppTest/earlyWarning/index.html?id="+warningNoticeLog.getId()+"&urlScheme="+urlScheme.getData();
                             WarningNoticeLogDto warningNoticeLogDto2 = new WarningNoticeLogDto();
                             //系统 短信 语音通知
-                            long systemNoticeCount = warningNoticeLogService.count(new LambdaQueryWrapper<WarningNoticeLog>().eq(WarningNoticeLog::getSubId, warningNoticeLog.getSubId())
+                            long noticeCount = warningNoticeLogService.count(new LambdaQueryWrapper<WarningNoticeLog>().eq(WarningNoticeLog::getSubId, warningNoticeLog.getSubId())
                                     .eq(WarningNoticeLog::getWarningType,1).eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE));
-                            long l = systemNoticeCount % warningConfig.getSystemNotice();
-                            if (warningConfig.getSystemNotice() != null && l == warningConfig.getSystemNotice()) {
+                            long l = noticeCount % warningConfig.getSystemNotice();
+                            if (warningConfig.getSystemNotice() != null && l == 0) {
                                 //系统通知
                                 warningWay.append("1,");
                                 LabMessageContent labMessageContent = new LabMessageContent();
@@ -235,10 +234,8 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                                 labMessageContent.setContent(systemText);
                                 labMessageContentService.sendMessage(labMessageContent);
                             }
-                            long messageNoticeCount = warningNoticeLogService.count(new LambdaQueryWrapper<WarningNoticeLog>().eq(WarningNoticeLog::getSubId, warningNoticeLog.getSubId())
-                                    .eq(WarningNoticeLog::getWarningType,1).eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE));
-                            long l1 = messageNoticeCount % warningConfig.getMessageNotice();
-                            if (warningConfig.getMessageNotice() != null && l1 == warningConfig.getMessageNotice()) {
+                            long l1 = noticeCount % warningConfig.getMessageNotice();
+                            if (warningConfig.getMessageNotice() != null && l1 == 0) {
                                 //短信通知
                                 warningWay.append("2,");
                                 String[] strings = Stream.of(phones.toString().split(",")).filter(a -> StrUtil.isNotBlank(a)).collect(Collectors.joining(",")).split(",");
@@ -249,10 +246,8 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                                     log.info("未穿戴实验服发送短信内容：{}",text);
                                 }
                             }
-                            long voiceNoticeCount = warningNoticeLogService.count(new LambdaQueryWrapper<WarningNoticeLog>().eq(WarningNoticeLog::getSubId, warningNoticeLog.getSubId())
-                                    .eq(WarningNoticeLog::getWarningType,1).eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE));
-                            long l2 = voiceNoticeCount % warningConfig.getVoiceNotcie();
-                            if (warningConfig.getVoiceNotcie() != null && l2 == warningConfig.getVoiceNotcie()) {
+                            long l2 = noticeCount % warningConfig.getVoiceNotcie();
+                            if (warningConfig.getVoiceNotcie() != null && l2 == 0) {
                                 warningWay.append("3,");
                                 warningNoticeLogDto2.setVoiceBroadcast(1);
                                 log.info("打开喇叭-远程调用查询喇叭列表，实验室id={}", warningNoticeLog.getSubId());
@@ -283,7 +278,7 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                             }
                             if(StringUtils.isNotBlank(warningWay)){
                                 warningNoticeLogDto2.setId(warningNoticeLog.getId());
-                                warningNoticeLogDto2.setWarningWay(warningWay.toString());
+                                warningNoticeLogDto2.setWarningWay(warningWay.toString().substring(0,warningWay.toString().length() - 1));
                                 ResultData updateResult = remoteLaboratoryService.updateWarningNoticeLog(warningNoticeLogDto2);
                                 if (HttpStatus.SUCCESS == updateResult.getCode()) {
                                     log.info("未穿戴实验服修改报警方式日志成功！");