|
@@ -29,7 +29,6 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
@RestController
|
|
@RestController
|
|
|
@RequestMapping("/alarm")
|
|
@RequestMapping("/alarm")
|
|
|
-@Slf4j
|
|
|
|
|
public class AlarmController extends BaseController {
|
|
public class AlarmController extends BaseController {
|
|
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
@@ -61,7 +60,7 @@ public class AlarmController extends BaseController {
|
|
|
@Async("msgExecutor")
|
|
@Async("msgExecutor")
|
|
|
public ResultData queryOption(@RequestBody AlarmEntrty alarmEntrty) {
|
|
public ResultData queryOption(@RequestBody AlarmEntrty alarmEntrty) {
|
|
|
if (alarmEntrty.getTo() == null || alarmEntrty.getTo().length == 0) {
|
|
if (alarmEntrty.getTo() == null || alarmEntrty.getTo().length == 0) {
|
|
|
- log.info("打电话发短信电话号码为空!");
|
|
|
|
|
|
|
+ logger.info("打电话发短信电话号码为空!");
|
|
|
return ResultData.fail("打电话发短信电话号码为空!");
|
|
return ResultData.fail("打电话发短信电话号码为空!");
|
|
|
}
|
|
}
|
|
|
//处理数据 短信拼装
|
|
//处理数据 短信拼装
|
|
@@ -101,7 +100,7 @@ public class AlarmController extends BaseController {
|
|
|
alarmLog.setKeyId(alarmEntrty.getLogId());
|
|
alarmLog.setKeyId(alarmEntrty.getLogId());
|
|
|
alarmLogService.insertAlarmLog(alarmLog);
|
|
alarmLogService.insertAlarmLog(alarmLog);
|
|
|
}
|
|
}
|
|
|
- log.info("电话预警通知用户成功!===>>>{}", JSON.toJSONString(alarmEntrty.getTo()));
|
|
|
|
|
|
|
+ logger.info("电话预警通知用户成功!===>>>{}", JSON.toJSONString(alarmEntrty.getTo()));
|
|
|
}else {
|
|
}else {
|
|
|
String[] phones = alarmEntrty.getTo();
|
|
String[] phones = alarmEntrty.getTo();
|
|
|
for (String phone : phones) {
|
|
for (String phone : phones) {
|
|
@@ -121,7 +120,7 @@ public class AlarmController extends BaseController {
|
|
|
alarmLog.setKeyId(alarmEntrty.getLogId());
|
|
alarmLog.setKeyId(alarmEntrty.getLogId());
|
|
|
alarmLogService.insertAlarmLog(alarmLog);
|
|
alarmLogService.insertAlarmLog(alarmLog);
|
|
|
}
|
|
}
|
|
|
- log.info("电话预警通知用户失败!===>>>{}", JSON.toJSONString(alarmEntrty.getTo()));
|
|
|
|
|
|
|
+ logger.info("电话预警通知用户失败!===>>>{}", JSON.toJSONString(alarmEntrty.getTo()));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -136,14 +135,14 @@ public class AlarmController extends BaseController {
|
|
|
if (urlScheme.getCode() == HttpStatus.SUCCESS) {
|
|
if (urlScheme.getCode() == HttpStatus.SUCCESS) {
|
|
|
textURL.append(smsRedirect).append("?id=").append(alarmEntrty.getLogId()).append("&urlScheme=").append(urlScheme.getData());
|
|
textURL.append(smsRedirect).append("?id=").append(alarmEntrty.getLogId()).append("&urlScheme=").append(urlScheme.getData());
|
|
|
}else {
|
|
}else {
|
|
|
- log.error("获取urlScheme失败!");
|
|
|
|
|
|
|
+ logger.error("获取urlScheme失败!");
|
|
|
}
|
|
}
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
- log.error("获取urlScheme异常!请检查配置(nacos链接配置,小程序参数配置)!");
|
|
|
|
|
|
|
+ logger.error("获取urlScheme异常!请检查配置(nacos链接配置,小程序参数配置)!");
|
|
|
}
|
|
}
|
|
|
alarmEntrty.setText(textURL.toString());
|
|
alarmEntrty.setText(textURL.toString());
|
|
|
alarmEntrty.setTo(new String[]{phone});
|
|
alarmEntrty.setTo(new String[]{phone});
|
|
|
- log.info("发送给用户===>>>{},短信内容===>>>{}",phone,textURL);
|
|
|
|
|
|
|
+ logger.info("发送给用户===>>>{},短信内容===>>>{}",phone,textURL);
|
|
|
//发送短信
|
|
//发送短信
|
|
|
Map map = alarmUtil.sendPost(alarmEntrty);
|
|
Map map = alarmUtil.sendPost(alarmEntrty);
|
|
|
String data = (String) map.get("Reply");
|
|
String data = (String) map.get("Reply");
|