新增日志

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/AlarmRecordServiceImpl.java

@@ -477,7 +477,6 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
                 userIdStr.append(i.getSafeUserId()).append(",").append(i.getAdminId());
                 phones.append(i.getAdminPhone()).append(",").append(i.getSafeUserPhone());
             }
-            //todo 记录的人物和实验室 气瓶 需要和申请的人物和实验室 气瓶 等 一一对应 现在无法对应 不能找出借出的气瓶对应的归还时间
             //过期时间在提醒天数内 并且在一天之内
             QpQualificationApplyVO qualificationApply = new QpQualificationApplyVO();
             qualificationApply.setUserId(QpUseRecord.getUserId());
@@ -513,11 +512,11 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
                 if (timeout.contains("2")) {
                     //短信通知
                     String[] strings = Stream.of(phones.toString().split(",")).filter(a -> StrUtil.isNotBlank(a)).collect(Collectors.joining(",")).split(",");
-
                     if (strings != null) {
                         AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.SMS.toString(), text);
                         remoteAlarmService.send(alarmEntrty);
                         log.info("气瓶超时未归还发送短信打电话消息推送完成！");
+                        log.info("气瓶超时未归还发送短信内容：{}",text);
                     }
                 }
                 QpUseRecord qpUseRecord = new QpUseRecord();

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpStockServiceImpl.java

@@ -468,6 +468,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                         AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.SMS.toString(), text);
                         remoteAlarmService.send(alarmEntrty);
                         logger.info("化学品违规带离发送短信打电话消息推送完成！");
+                        logger.info("化学品违规带离发送短信内容：{}",text);
                     }
                 }
                 if (hardwareRfidDto != null && illegalRemoval.contains("3")) {
@@ -916,9 +917,8 @@ public class HxpStockServiceImpl implements IHxpStockService {
      * @Param []
      * @Return void
      **/
-
-    @Scheduled(cron = "0 0 0 * * ?")
 //    @Scheduled(cron = "0 0/1 * * * ? ")
+    @Scheduled(cron = "0 0 0 * * ?")
     public void hxpExpired() {
         // 查询配置
         ResultData<WarningConfigDto> byType = remoteLaboratoryService.getByType(2);
@@ -991,7 +991,6 @@ public class HxpStockServiceImpl implements IHxpStockService {
                     logger.error("获取urlScheme失败！");
                 }
                 String text = "【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-"+warningNoticeLogDto.getName()+"即将过期，发生时间：" + LocalDateTime.now() + ",请尽快确认。点击查看：https://lab.zjznai.com/labAppTest/earlyWarning/index.html?id="+result.getData()+"&urlScheme="+urlScheme.getData();
-                        ;
                 if (unexpired.contains("1")) {
                     //系统通知
                     LabMessageContent labMessageContent = new LabMessageContent();
@@ -1011,7 +1010,8 @@ public class HxpStockServiceImpl implements IHxpStockService {
                     if (strings != null) {
                         AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.SMS.toString(), text);
                         remoteAlarmService.send(alarmEntrty);
-                        logger.info("化学品发送短信打电话消息推送完成！");
+                        logger.info("化学品即将过期发送短信打电话消息推送完成！");
+                        logger.info("化学品即将过期发送短信内容：{}",text);
                     }
                 }
             }
@@ -1048,7 +1048,8 @@ public class HxpStockServiceImpl implements IHxpStockService {
                     if (strings != null) {
                         AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.SMS.toString(), text2);
                         remoteAlarmService.send(alarmEntrty);
-                        logger.info("化学品发送短信打电话消息推送完成！");
+                        logger.info("化学品已过期发送短信打电话消息推送完成！");
+                        logger.info("化学品已过期发送短信内容：{}",text2);
                     }
                 }
             }
@@ -1147,7 +1148,8 @@ public class HxpStockServiceImpl implements IHxpStockService {
                         if (strings != null) {
                             AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.SMS.toString(), text);
                             remoteAlarmService.send(alarmEntrty);
-                            logger.info("化学品发送短信打电话消息推送完成！");
+                            logger.info("化学品超时未归还发送短信打电话消息推送完成！");
+                            logger.info("化学品超时未归还发送短信内容：{}",text);
                         }
                     }
                 }

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

@@ -225,11 +225,11 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                     if (warningConfig.getMessageNotice() != null && count1 > warningConfig.getMessageNotice()) {
                         //短信通知
                         String[] strings = Stream.of(phones.toString().split(",")).filter(a -> StrUtil.isNotBlank(a)).collect(Collectors.joining(",")).split(",");
-
                         if (strings != null) {
                             AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.SMS.toString(), text);
                             remoteAlarmService.send(alarmEntrty);
                             log.info("未穿戴实验服发送短信打电话消息推送完成！");
+                            log.info("未穿戴实验服发送短信内容：{}",text);
                         }
                     }
                     if (warningConfig.getVoiceNotcie() != null && count1 > warningConfig.getVoiceNotcie()) {