|
@@ -18,13 +18,11 @@ import com.zd.model.domain.per.PerFun;
|
|
|
import com.zd.model.domain.per.PerPrefix;
|
|
import com.zd.model.domain.per.PerPrefix;
|
|
|
import com.zd.model.page.TableDataInfo;
|
|
import com.zd.model.page.TableDataInfo;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
-import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
-import javax.validation.constraints.NotNull;
|
|
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
@@ -67,6 +65,8 @@ public class AlarmController extends BaseController {
|
|
|
//处理数据 短信拼装
|
|
//处理数据 短信拼装
|
|
|
String sendType = alarmEntrty.getType();
|
|
String sendType = alarmEntrty.getType();
|
|
|
AlarmEntrty alarmEntrtySMS = new AlarmEntrty(alarmEntrty.getRoute(), alarmEntrty.getTo(), alarmEntrty.getType(), alarmEntrty.getText());
|
|
AlarmEntrty alarmEntrtySMS = new AlarmEntrty(alarmEntrty.getRoute(), alarmEntrty.getTo(), alarmEntrty.getType(), alarmEntrty.getText());
|
|
|
|
|
+ alarmEntrtySMS.setUserPhoneInfo(alarmEntrty.getUserPhoneInfo());
|
|
|
|
|
+ alarmEntrtySMS.setLogId(alarmEntrty.getLogId());
|
|
|
if((SendTypes.All.toString()).equals(sendType) || (SendTypes.SMS.toString()).equals(sendType) ){
|
|
if((SendTypes.All.toString()).equals(sendType) || (SendTypes.SMS.toString()).equals(sendType) ){
|
|
|
//发短信
|
|
//发短信
|
|
|
alarmEntrtySMS.setType(SendTypes.SMS.toString());
|
|
alarmEntrtySMS.setType(SendTypes.SMS.toString());
|