|
|
@@ -18,6 +18,7 @@ import com.zd.model.domain.per.PerFun;
|
|
|
import com.zd.model.domain.per.PerPrefix;
|
|
|
import com.zd.model.page.TableDataInfo;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
@@ -28,6 +29,7 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping("/alarm")
|
|
|
+@Slf4j
|
|
|
public class AlarmController extends BaseController {
|
|
|
|
|
|
@Autowired
|
|
|
@@ -59,7 +61,7 @@ public class AlarmController extends BaseController {
|
|
|
@Async("msgExecutor")
|
|
|
public ResultData queryOption(@RequestBody AlarmEntrty alarmEntrty) {
|
|
|
if (alarmEntrty.getTo() == null || alarmEntrty.getTo().length == 0) {
|
|
|
- logger.info("打电话发短信电话号码为空!");
|
|
|
+ log.info("打电话发短信电话号码为空!");
|
|
|
return ResultData.fail("打电话发短信电话号码为空!");
|
|
|
}
|
|
|
//处理数据 短信拼装
|
|
|
@@ -142,7 +144,7 @@ public class AlarmController extends BaseController {
|
|
|
alarmLog.setKeyId(alarmEntrty.getLogId());
|
|
|
alarmLogService.insertAlarmLog(alarmLog);
|
|
|
}
|
|
|
- logger.info("电话预警通知用户成功!===>>>{}", JSON.toJSONString(alarmEntrty.getTo()));
|
|
|
+ log.info("电话预警通知用户成功!===>>>{}", JSON.toJSONString(alarmEntrty.getTo()));
|
|
|
}else {
|
|
|
String[] phones = alarmEntrty.getTo();
|
|
|
for (String phone : phones) {
|
|
|
@@ -162,7 +164,7 @@ public class AlarmController extends BaseController {
|
|
|
alarmLog.setKeyId(alarmEntrty.getLogId());
|
|
|
alarmLogService.insertAlarmLog(alarmLog);
|
|
|
}
|
|
|
- logger.info("电话预警通知用户失败!===>>>{}", JSON.toJSONString(alarmEntrty.getTo()));
|
|
|
+ log.info("电话预警通知用户失败!===>>>{}", JSON.toJSONString(alarmEntrty.getTo()));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -173,13 +175,13 @@ public class AlarmController extends BaseController {
|
|
|
for (String phone : alarmEntrty.getTo()) {
|
|
|
ResultData urlScheme = remoteMessageService.getUrlScheme(alarmEntrty.getLogId());
|
|
|
if (urlScheme.getCode() != HttpStatus.SUCCESS) {
|
|
|
- logger.error("获取urlScheme失败!");
|
|
|
+ log.error("获取urlScheme失败!");
|
|
|
}
|
|
|
String newTest = "";
|
|
|
newTest = text + "?id=" + alarmEntrty.getLogId() + "&urlScheme=" + urlScheme.getData();
|
|
|
alarmEntrty.setText(newTest);
|
|
|
alarmEntrty.setTo(new String[]{phone});
|
|
|
- logger.info("发送给用户===>>>{},短信内容===>>>{}",phone,newTest);
|
|
|
+ log.info("发送给用户===>>>{},短信内容===>>>{}",phone,newTest);
|
|
|
//发送短信
|
|
|
Map map = alarmUtil.sendPost(alarmEntrty);
|
|
|
String data = (String) map.get("Reply");
|