|
@@ -111,6 +111,9 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private RemoteMessageService remoteMessageService;
|
|
private RemoteMessageService remoteMessageService;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private ILabSubjectService labSubjectService;
|
|
|
|
|
+
|
|
|
private final String callType = "1";
|
|
private final String callType = "1";
|
|
|
|
|
|
|
|
private final String smsType = "2";
|
|
private final String smsType = "2";
|
|
@@ -303,7 +306,9 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
|
|
|
// logger.error("获取实验室内部短信发送人出错");
|
|
// logger.error("获取实验室内部短信发送人出错");
|
|
|
// }
|
|
// }
|
|
|
//获取人员电话信息
|
|
//获取人员电话信息
|
|
|
- List<UserPhoneInfo> userPhoneInfoList = getUserPhoneInfos(subject);
|
|
|
|
|
|
|
+// List<UserPhoneInfo> userPhoneInfoList = getUserPhoneInfos(subject);
|
|
|
|
|
+ //获取人员电话信息
|
|
|
|
|
+ List<UserPhoneInfo> userPhoneInfos = labSubjectService.selectAdminAndSafeAdminById(subject.getId());
|
|
|
String[] strings = Stream.of(new String[]{subject.getAdminPhone(), subject.getSafeUserPhone()})
|
|
String[] strings = Stream.of(new String[]{subject.getAdminPhone(), subject.getSafeUserPhone()})
|
|
|
.filter(a -> StrUtil.isNotBlank(a))
|
|
.filter(a -> StrUtil.isNotBlank(a))
|
|
|
.collect(Collectors.joining(","))
|
|
.collect(Collectors.joining(","))
|
|
@@ -322,7 +327,7 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
|
|
|
}else if(alarms.contains(smsType)) {
|
|
}else if(alarms.contains(smsType)) {
|
|
|
alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.SMS.toString(),format);
|
|
alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.SMS.toString(),format);
|
|
|
}
|
|
}
|
|
|
- alarmEntrty.setUserPhoneInfo(userPhoneInfoList);
|
|
|
|
|
|
|
+ alarmEntrty.setUserPhoneInfo(userPhoneInfos);
|
|
|
alarmEntrty.setLogId(logId);
|
|
alarmEntrty.setLogId(logId);
|
|
|
remoteAlarmService.send(alarmEntrty);
|
|
remoteAlarmService.send(alarmEntrty);
|
|
|
// MessageBody messageBody = new MessageBody();
|
|
// MessageBody messageBody = new MessageBody();
|