修改系统通知发送消息内容

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

@@ -198,7 +198,12 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
                 }
                 //按照配置预警
                 if (illegalRemoval != null) {
-                    String text = "【实验室安全系统】-实验人员违规X气携带气瓶离开房间，发生时间：" + LocalDateTimeUtil.format(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss") + ",请尽快确认。点击查看：" + "http://";
+                    ResultData urlScheme = remoteMessageService.getUrlScheme(logId);
+                    if (urlScheme.getCode() != HttpStatus.SUCCESS) {
+                        log.error("获取urlScheme失败！");
+                    }
+                    String systemText = "【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-实验人员违规携带"+warningNoticeLogDto.getName()+"气瓶离开房间，发生时间：" + LocalDateTimeUtil.format(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss") + ",请尽快确认。";
+                    String text = "【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-实验人员违规携带"+warningNoticeLogDto.getName()+"气瓶离开房间，发生时间：" + LocalDateTimeUtil.format(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss") + ",请尽快确认。点击查看：" + "https://lab.zjznai.com/labAppTest/earlyWarning/index.html?id="+ logId + "&urlScheme=" + urlScheme.getData();
 
                     //系统通知
                     if (illegalRemoval.contains("1")) {
@@ -209,7 +214,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
                         labMessageContent.setMessType(13);
                         labMessageContent.setSubIds(String.valueOf(storageRVo.getSubjectId()));
                         labMessageContent.setUserIds(userIds.toString());
-                        labMessageContent.setContent(text);
+                        labMessageContent.setContent(systemText);
                         remoteMessageContentService.sendMessage(labMessageContent);
 
                     }
@@ -496,6 +501,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
                 if(urlScheme.getCode() != HttpStatus.SUCCESS){
                     log.error("获取urlScheme失败！");
                 }
+                String systemText = "【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-"+qpBottleStorageVO.getCreateBy()+"领用"+warningNoticeLogDto.getName()+"气瓶超时未归还，领用时间："+LocalDateTime.now().toString()+",请尽快确认。";
                 String text = "【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-"+qpBottleStorageVO.getCreateBy()+"领用"+warningNoticeLogDto.getName()+"气瓶超时未归还，领用时间："+LocalDateTime.now().toString()+",请尽快确认。点击查看：https://lab.zjznai.com/labAppTest/earlyWarning/index.html?id="+resultData.getData()+"&urlScheme="+urlScheme.getData();
                 if (timeout.contains("1")) {
                     //系统通知
@@ -506,7 +512,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
                     labMessageContent.setMessType(13);
                     labMessageContent.setSubIds(String.valueOf(QpUseRecord.getSubjectId()));
                     labMessageContent.setUserIds(userIdStr.toString());
-                    labMessageContent.setContent(text);
+                    labMessageContent.setContent(systemText);
                     remoteMessageContentService.sendMessage(labMessageContent);
                 }
                 if (timeout.contains("2")) {

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

@@ -446,6 +446,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                 if (urlScheme.getCode() != HttpStatus.SUCCESS) {
                     logger.error("获取urlScheme失败！");
                 }
+                String systemText = "【实验室安全系统】" + warningNoticeLogDto.getSubName() + "-实验人员违规携带" + warningNoticeLogDto.getName() + "离开房间，发生时间：" + LocalDateTimeUtil.format(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss") + ",请尽快确认。";
                 String text = "【实验室安全系统】" + warningNoticeLogDto.getSubName() + "-实验人员违规携带" + warningNoticeLogDto.getName() + "离开房间，发生时间：" + LocalDateTimeUtil.format(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss") + ",请尽快确认。点击查看：https://lab.zjznai.com/labAppTest/earlyWarning/index.html?id=" + logId + "&urlScheme=" + urlScheme.getData();
                 //系统通知
                 if (illegalRemoval.contains("1")) {
@@ -456,7 +457,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                     labMessageContent.setMessType(13);
                     labMessageContent.setSubIds(String.valueOf(hxpStock.getSubId()));
                     labMessageContent.setUserIds(userIdStr.toString());
-                    labMessageContent.setContent(text);
+                    labMessageContent.setContent(systemText);
                     remoteMessageContentService.sendMessage(labMessageContent);
 
                 }
@@ -990,6 +991,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                 if(urlScheme.getCode() != HttpStatus.SUCCESS){
                     logger.error("获取urlScheme失败！");
                 }
+                String systemText = "【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-"+warningNoticeLogDto.getName()+"即将过期，发生时间：" + LocalDateTime.now() + ",请尽快确认。";
                 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")) {
                     //系统通知
@@ -1000,7 +1002,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                     labMessageContent.setMessType(13);
                     labMessageContent.setSubIds(String.valueOf(hxpStock.getSubId()));
                     labMessageContent.setUserIds(userIdStr.toString());
-                    labMessageContent.setContent(text);
+                    labMessageContent.setContent(systemText);
                     remoteMessageContentService.sendMessage(labMessageContent);
 
                 }
@@ -1029,6 +1031,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                 if(urlScheme.getCode() != HttpStatus.SUCCESS){
                     logger.error("获取urlScheme失败！");
                 }
+                String systemText2 =  "【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-"+warningNoticeLogDto.getName()+"已过期，请尽快确认。";
                 String text2 =  "【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-"+warningNoticeLogDto.getName()+"已过期，请尽快确认。点击查看：https://lab.zjznai.com/labAppTest/earlyWarning/index.html?id="+result.getData()+"&urlScheme="+urlScheme.getData();
                 if (expired.contains("1")) {
                     //系统通知
@@ -1039,7 +1042,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                     labMessageContent.setMessType(13);
                     labMessageContent.setSubIds(String.valueOf(hxpStock.getSubId()));
                     labMessageContent.setUserIds(userIdStr.toString());
-                    labMessageContent.setContent(text2);
+                    labMessageContent.setContent(systemText2);
                     remoteMessageContentService.sendMessage(labMessageContent);
                 }
                 if (expired.contains("2")) {
@@ -1129,6 +1132,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                     if(urlScheme.getCode() != HttpStatus.SUCCESS){
                         logger.error("获取urlScheme失败！");
                     }
+                    String systemText ="【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-"+warningNoticeLogDto.getApply()+"领用"+warningNoticeLogDto.getName()+"超时未归还，领用时间："+LocalDateTime.now().toString() +",请尽快确认。";
                     String text = "【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-"+warningNoticeLogDto.getApply()+"领用"+warningNoticeLogDto.getName()+"超时未归还，领用时间："+LocalDateTime.now().toString() +",请尽快确认。点击查看：https://lab.zjznai.com/labAppTest/earlyWarning/index.html?id="+result.getData()+"&urlScheme="+ urlScheme.getData();
                     if (timeout.contains("1")) {
                         //系统通知
@@ -1139,7 +1143,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                         labMessageContent.setMessType(13);
                         labMessageContent.setSubIds(String.valueOf(hxpStock.getSubId()));
                         labMessageContent.setUserIds(userIdStr.toString());
-                        labMessageContent.setContent(text);
+                        labMessageContent.setContent(systemText);
                         remoteMessageContentService.sendMessage(labMessageContent);
                     }
                     if (timeout.contains("2")) {

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

@@ -208,6 +208,7 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                     if(urlScheme.getCode() != HttpStatus.SUCCESS){
                         log.error("获取urlScheme失败！");
                     }
+                    String systemText = "【实验室安全系统】"+warningNoticeLog.getSubName()+"-监测到实验人员违规未穿戴实验服，请尽快确认。";
                     String text = "【实验室安全系统】"+warningNoticeLog.getSubName()+"-监测到实验人员违规未穿戴实验服，请尽快确认。点击查看：https://lab.zjznai.com/labAppTest/earlyWarning/index.html?id="+warningNoticeLog.getId()+"&urlScheme="+urlScheme.getData();
                     //系统 短信 语音通知
                     if (warningConfig.getSystemNotice() != null && count1 > warningConfig.getSystemNotice()) {
@@ -219,7 +220,7 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                         labMessageContent.setMessType(13);
                         labMessageContent.setSubIds(String.valueOf(warningNoticeLog.getSubId()));
                         labMessageContent.setUserIds(userIds.toString());
-                        labMessageContent.setContent(text);
+                        labMessageContent.setContent(systemText);
                         labMessageContentService.sendMessage(labMessageContent);
                     }
                     if (warningConfig.getMessageNotice() != null && count1 > warningConfig.getMessageNotice()) {