|
|
@@ -19,6 +19,7 @@ import com.zd.model.domain.per.PerPrefix;
|
|
|
import com.zd.model.page.TableDataInfo;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
@@ -38,6 +39,9 @@ public class AlarmController extends BaseController {
|
|
|
@Autowired
|
|
|
private RemoteMessageService remoteMessageService;
|
|
|
|
|
|
+ @Value("${alarm.smsRedirect}")
|
|
|
+ private String smsRedirect;
|
|
|
+
|
|
|
/**
|
|
|
* 查询算法结果列表
|
|
|
* @return
|
|
|
@@ -165,14 +169,14 @@ 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=";
|
|
|
+ String text = alarmEntrty.getText() + smsRedirect;
|
|
|
for (String phone : alarmEntrty.getTo()) {
|
|
|
ResultData urlScheme = remoteMessageService.getUrlScheme(alarmEntrty.getLogId());
|
|
|
if (urlScheme.getCode() != HttpStatus.SUCCESS) {
|
|
|
logger.error("获取urlScheme失败!");
|
|
|
}
|
|
|
String newTest = "";
|
|
|
- newTest = text + alarmEntrty.getLogId() + "&urlScheme=" + urlScheme.getData();
|
|
|
+ newTest = text + "?id=" + alarmEntrty.getLogId() + "&urlScheme=" + urlScheme.getData();
|
|
|
alarmEntrty.setText(newTest);
|
|
|
alarmEntrty.setTo(new String[]{phone});
|
|
|
logger.info("发送给用户===>>>{},短信内容===>>>{}",phone,newTest);
|