合并打电话发短信23日代码

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

@@ -219,6 +219,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
                 //按照配置预警
                 if (illegalRemoval != null) {
                     String text = "【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-实验人员违规携带"+warningNoticeLogDto.getName()+"气瓶离开房间，发生时间：" + LocalDateTimeUtil.format(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss") + ",请尽快确认。";
+                    String templateContent = "【忠江科技】{lab_name}-实验人员违规携带{res_name}气瓶离开房间，发生时间：{date},请尽快确认。";
                     List<String> paramList=new ArrayList<>();
                     paramList.add(warningNoticeLogDto.getSubName());
                     paramList.add(warningNoticeLogDto.getName());
@@ -252,10 +253,12 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
                             userPhoneInfoList.forEach(a->{
                                 phoneList.add(a.getPhone());
                             });
-                            textMessageVo.setTempContent(text);
+                            textMessageVo.setTempContent(templateContent);
 //                            alarmEntrty.setLogId(logId);
                             textMessageVo.setVariableList(paramList);
                             textMessageVo.setPhoneList(phoneList);
+                            textMessageVo.setTempId("142745");
+                            textMessageVo.setSignature("【忠江科技】");
 //                            alarmEntrty.setUserPhoneInfo(userPhoneInfoList);
 //                            remoteAlarmService.send(alarmEntrty);
                             //// TODO: 2024/4/9
@@ -547,6 +550,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
                 Long logId = (Long) resultData.getData();
 
                 String text = "【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-"+warningNoticeLogDto.getApplyUser()+"领用"+warningNoticeLogDto.getName()+"气瓶超时未归还，领用时间："+LocalDateTimeUtil.format(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss")+",请尽快确认。";
+                String templateContent = "【忠江科技】{lab_name} - {apply_user} 领用 {name} 气瓶超时未归还，领用时间：{date},请尽快确认。";
                 if (timeout.contains("1")) {
                     //系统通知
                     LabMessageContent labMessageContent = new LabMessageContent();
@@ -584,8 +588,10 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
 //                        remoteAlarmService.send(alarmEntrty);
                         TextMessageVo textMessageVo=new TextMessageVo();
                         textMessageVo.setPhoneList(phoneList);
-                        textMessageVo.setTempContent(text);
+                        textMessageVo.setTempContent(templateContent);
                         textMessageVo.setVariableList(paramList);
+                        textMessageVo.setSignature("【忠江科技】");
+                        textMessageVo.setTempId("142757");
                         remoteSmsService.sendTemplateMessage(textMessageVo);
                         log.info("气瓶超时未归还发送短信打电话消息推送完成！");
                     }

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

@@ -619,7 +619,7 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
                         textMessageVo.setPhoneList(Arrays.asList(strings));
                         paramList.add(subName);
                         textMessageVo.setVariableList(paramList);
-                        textMessageVo.setTempId("142020");
+                        textMessageVo.setTempId("142749");
                         textMessageVo.setTempContent(tempConent);
                         remoteSmsService.sendVoiceMessage(textMessageVo);
                         remoteSmsService.sendTemplateMessage(textMessageVo);

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

@@ -478,7 +478,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                             textMessageVo.setPhoneList(userPhoneInfoList.stream().map(UserPhoneInfo::getPhone).collect(Collectors.toList()));
                             textMessageVo.setTempContent(templateContent);
                             textMessageVo.setVariableList(paramList);
-                            textMessageVo.setTempId("142047");
+                            textMessageVo.setTempId("142755");
                             remoteSmsService.sendTemplateMessage(textMessageVo);
                             logger.info("化学品违规带离发送短信打电话消息推送完成！");
                         }else{
@@ -653,7 +653,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                 paramList.add(subName);
                 paramList.add(chemicalName);
                 textMessageVo.setVariableList(paramList);
-                textMessageVo.setTempId("142046");
+                textMessageVo.setTempId("142740");
                 textMessageVo.setTempContent(templateContent);
                 remoteSmsService.sendVoiceMessage(textMessageVo);//发送语音
                 remoteSmsService.sendTemplateMessage(textMessageVo);//发送短信
@@ -937,7 +937,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
             paramList.add(warningNoticeLogDto.getName());
             paramList.add(LocalDateTimeUtil.format(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss"));
             //发送通知
-            sendNotice(hxpStock, userIdStr, phones, warningConfigDto.getUnexpired(),text,logId,paramList,"142030","【忠江科技】{lab_name}-{name} 即将过期，发生时间：{date} ,请尽快确认。");
+            sendNotice(hxpStock, userIdStr, phones, warningConfigDto.getUnexpired(),text,logId,paramList,"142753","【忠江科技】{lab_name}-{name} 即将过期，发生时间：{date} ,请尽快确认。");
         });
     }
 
@@ -996,7 +996,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
             parmList.add(warningNoticeLogDto.getSubName());
             parmList.add(warningNoticeLogDto.getName());
             //发送通知
-            sendNotice(hxpStock, userIdStr, phones, warningConfigDto.getExpired(), text, logId,parmList,"142031","【忠江科技】{lab_name}-{name}已过期，请尽快确认。");
+            sendNotice(hxpStock, userIdStr, phones, warningConfigDto.getExpired(), text, logId,parmList,"142742","【忠江科技】{lab_name}-{name}已过期，请尽快确认。");
         });
 
         List<Long> stockIds = expiredStock.stream().filter(i -> 1 == i.getStatus()).map(HxpStockVO::getId).collect(Collectors.toList());
@@ -1177,7 +1177,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                                 TextMessageVo textMessageVo=new TextMessageVo();
                                 textMessageVo.setPhoneList(userPhoneInfoList.stream().map(UserPhoneInfo::getPhone).collect(Collectors.toList()));
                                 textMessageVo.setTempContent(templateContent);
-                                textMessageVo.setTempId("142034");
+                                textMessageVo.setTempId("142754");
                                 textMessageVo.setVariableList(paramList);
                                 remoteSmsService.sendTemplateMessage(textMessageVo);
                                 logger.info("化学品超时未归还发送短信打电话消息推送完成！");

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

@@ -240,7 +240,7 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                                         paramList.add(warningNoticeLog.getSubName());
                                         paramList.add("实验服");
                                         textMessageVo.setVariableList(paramList);
-                                        textMessageVo.setTempId("142019");
+                                        textMessageVo.setTempId("142751");
                                         textMessageVo.setTempContent("【忠江科技】{sub_name} -监测到实验人员违规未穿戴{protective_clothing}，请尽快确认。");
                                         remoteSmsService.sendTemplateMessage(textMessageVo);
                                         log.info("未穿戴实验服发送短信打电话消息推送完成！");

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabMessageContentServiceImpl.java

@@ -98,6 +98,8 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
 
     @Autowired
     private RemoteSmsService remoteSmsService;
+    @Autowired
+    private ILabMessageService labMessageService;
 
     public Integer phoneMode;
 
@@ -291,35 +293,29 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
                 paramList.add(labRiskPlanLevel.getTopName());
                 paramList.add(labRiskPlanLevel.getRiskName());
                 textMessageVo.setVariableList(paramList);
-                textMessageVo.setTempId("142024");
+                textMessageVo.setTempId("142738");
                 textMessageVo.setTempContent("【忠江科技】{lab_name}-{risk_name}数值异常，请立即核实处理！");
                 if (alarms.contains(callType) && alarms.contains(smsType)) {
-//                    alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, format);
                     try {
                         logger.info("短信平台调用检测,param:{}",JSON.toJSONString(textMessageVo));
-                        remoteSmsService.sendVoiceMessage(textMessageVo);
-                        remoteSmsService.sendTemplateMessage(textMessageVo);
+                        labMessageService.sendMessageTemp(textMessageVo);
+                        labMessageService.sendMessageVoice(textMessageVo);
                     } catch (Exception e) {
                         logger.info("远程打电话发短信调用异常！{}",e);
                     }
                 }else if(alarms.contains(callType)){
-//                    alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.Call.toString(),format);
                     try {
-                        remoteSmsService.sendVoiceMessage(textMessageVo);
+                        labMessageService.sendMessageVoice(textMessageVo);
                     } catch (Exception e) {
                         logger.info("远程打电话调用异常！{}",e);
                     }
                 }else if(alarms.contains(smsType)) {
-//                    alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.SMS.toString(),format);
                     try {
-                        remoteSmsService.sendTemplateMessage(textMessageVo);
+                        labMessageService.sendMessageTemp(textMessageVo);
                     } catch (Exception e) {
                         logger.info("远程发短信调用异常！{}",e);
                     }
                 }
-//                alarmEntrty.setUserPhoneInfo(userPhoneInfos);
-//                alarmEntrty.setLogId(logId);
-//                remoteAlarmService.send(alarmEntrty);
                 logger.info("发送短信打电话消息推送完成！topic={},msg={}",MqttConstants.TOPIC_ALERT + labRiskPlanLevel.getRiskPlanId() + "/" + subject.getId(),JSON.toJSONString(alarmEntrty));
                 try {
                     if (subject.getAdminId() != null) {