|
|
@@ -5,6 +5,7 @@ import com.jjt.biz.domain.AlarmRecord;
|
|
|
import com.jjt.common.utils.DateUtils;
|
|
|
import com.jjt.common.utils.StringUtils;
|
|
|
import com.jjt.push.domain.PushConfig;
|
|
|
+import com.jjt.push.domain.PushRecord;
|
|
|
import com.jjt.push.mapper.PushConfigMapper;
|
|
|
import com.jjt.push.service.IMailService;
|
|
|
import com.jjt.push.service.IPushConfigService;
|
|
|
@@ -31,6 +32,8 @@ public class PushConfigServiceImpl implements IPushConfigService {
|
|
|
private IMailService mailService;
|
|
|
@Resource
|
|
|
private ISmsService smsService;
|
|
|
+ @Resource
|
|
|
+ private PushRecordServiceImpl pushRecordService;
|
|
|
|
|
|
/**
|
|
|
* 查询推送配置
|
|
|
@@ -158,11 +161,21 @@ public class PushConfigServiceImpl implements IPushConfigService {
|
|
|
if (StringUtils.isNotEmpty(phones)) {
|
|
|
String[] ps = phones.split("\n");
|
|
|
for (String p : ps) {
|
|
|
+ PushRecord pr = new PushRecord();
|
|
|
+ pr.setPushType("sms");
|
|
|
+ pr.setAlarmLevel(record.getAlarmLevel());
|
|
|
+ pr.setSendTitle(title);
|
|
|
+// pr.setSendContent(content);
|
|
|
+ pr.setSendObj(p);
|
|
|
try {
|
|
|
- smsService.send(uri, p, content);
|
|
|
+ smsService.send(uri, p, title);
|
|
|
+ pr.setSendSuccess("Y");
|
|
|
} catch (Exception e) {
|
|
|
+ pr.setSendSuccess("N");
|
|
|
log.error("短信发送失败:{}", e.getMessage());
|
|
|
+ pr.setRemark(e.getMessage());
|
|
|
}
|
|
|
+ pushRecordService.insertPushRecord(pr);
|
|
|
}
|
|
|
}
|
|
|
} catch (Exception e) {
|
