|
|
@@ -163,16 +163,17 @@ public class AlarmController extends BaseController {
|
|
|
private void sendSMS(AlarmEntrty alarmEntrty) {
|
|
|
List<UserPhoneInfo> userPhoneInfoList = alarmEntrty.getUserPhoneInfo();
|
|
|
LinkedHashMap<String, List<UserPhoneInfo>> userPhoneInfoMap = Optional.ofNullable(userPhoneInfoList).orElseGet(Collections::emptyList).stream().collect(Collectors.groupingBy(UserPhoneInfo::getPhone, LinkedHashMap::new, Collectors.toList()));
|
|
|
+ String text = alarmEntrty.getText() + "https://lab.zjznai.com/labAppTest/earlyWarning/index.html?id=";
|
|
|
for (String phone : alarmEntrty.getTo()) {
|
|
|
ResultData urlScheme = remoteMessageService.getUrlScheme(alarmEntrty.getLogId());
|
|
|
if (urlScheme.getCode() != HttpStatus.SUCCESS) {
|
|
|
logger.error("获取urlScheme失败!");
|
|
|
}
|
|
|
- String text = alarmEntrty.getText();
|
|
|
- text = text + "https://lab.zjznai.com/labAppTest/earlyWarning/index.html?id=?id=" + alarmEntrty.getLogId() + "&urlScheme=" + urlScheme.getData();
|
|
|
- alarmEntrty.setText(text);
|
|
|
+ String newTest = "";
|
|
|
+ newTest = text + alarmEntrty.getLogId() + "&urlScheme=" + urlScheme.getData();
|
|
|
+ alarmEntrty.setText(newTest);
|
|
|
alarmEntrty.setTo(new String[]{phone});
|
|
|
- logger.info("发送给用户===>>>{},短信内容===>>>{}",phone,text);
|
|
|
+ logger.info("发送给用户===>>>{},短信内容===>>>{}",phone,newTest);
|
|
|
//发送短信
|
|
|
Map map = alarmUtil.sendPost(alarmEntrty);
|
|
|
String data = (String) map.get("Reply");
|