修改短信发送问题2

zd-modules/zd-algorithm/src/main/java/com/zd/alg/alarm/controller/AlarmController.java

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotNull;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -65,10 +66,11 @@ public class AlarmController extends BaseController {
         }
         //处理数据 短信拼装
         String sendType = alarmEntrty.getType();
+        AlarmEntrty alarmEntrtySMS = new AlarmEntrty(alarmEntrty.getRoute(), alarmEntrty.getTo(), alarmEntrty.getType(), alarmEntrty.getText());
         if((SendTypes.All.toString()).equals(sendType) || (SendTypes.SMS.toString()).equals(sendType) ){
             //发短信
-            alarmEntrty.setType(SendTypes.SMS.toString());
-            sendSMS(alarmEntrty);
+            alarmEntrtySMS.setType(SendTypes.SMS.toString());
+            sendSMS(alarmEntrtySMS);
         }
         if((SendTypes.All.toString()).equals(sendType) || (SendTypes.Call.toString()).equals(sendType)){
             //打电话
@@ -127,9 +129,10 @@ 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();
         for (String phone : alarmEntrty.getTo()) {
             StringBuffer textURL = new StringBuffer();
-            textURL.append(alarmEntrty.getText());
+            textURL.append(text);
             try {
                 ResultData urlScheme = remoteMessageService.getUrlScheme(alarmEntrty.getLogId());
                 if (urlScheme.getCode() == HttpStatus.SUCCESS) {