From 93c783e6ddf2731eab9cf264a7882632c8ce955f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 10 Jul 2023 17:30:50 +0800
Subject: [PATCH] 初次超汛限告警新增站内信信息发送
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java | 259 ++++++++++++++++++++++-----------------------------
1 files changed, 114 insertions(+), 145 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java
index 4f6874f..24ae8c7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java
@@ -6,9 +6,12 @@
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendDataResult;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
import cn.gistack.alerts.alarmRule.entity.AlarmRecordDetail;
+import cn.gistack.alerts.alarmRule.entity.AlarmRule;
import cn.gistack.alerts.alarmRule.service.AlarmRecordDetailService;
+import cn.gistack.alerts.notice.service.impl.NoticeHandle;
import cn.gistack.alerts.notice.util.FormatUtil;
import cn.gistack.alerts.sms.constant.MinConstant;
+import cn.gistack.alerts.sms.dto.DynSMSSendRequestDTO;
import cn.gistack.alerts.sms.entity.SmsRecord;
import cn.gistack.alerts.sms.entity.SmsRequest;
import cn.gistack.alerts.sms.entity.SmsResult;
@@ -23,12 +26,14 @@
import cn.gistack.alerts.sms.vo.SmsResponseVO;
import cn.gistack.sm.intelligentCall.entity.CallNotFillRecord;
import cn.gistack.sm.intelligentCall.feign.OutCallClient;
+import cn.gistack.sm.message.entity.MessageRecord;
import cn.gistack.sm.sjztmd.feign.IAttResManagePersonClient;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.google.common.collect.Lists;
import org.jetbrains.annotations.NotNull;
import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -74,6 +79,9 @@
@Autowired
private SmsAsyncService asyncService;
+ @Autowired
+ private NoticeHandle noticeHandle;
+
/**
* 发送 xx 变量模板短信
* @param phoneNumbers 手机号集合
@@ -101,8 +109,90 @@
return list;
}
+ /**
+ * 发送 具名 变量模板短信（告警定制）-- 动态发送-一个一个发
+ * @param smsRequestTemplate
+ * @return
+ */
+ @Override
+ public Map<String, Object> sendSignMsg(SmsRequestTemplate smsRequestTemplate) {
+ // 取出数据
+ SMSSendRequest request = new SMSSendRequest();
+ SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
+ AlarmRule alarmRule = smsRequestTemplate.getAlarmRule();
+ request.setTemplateId(smsTemplate.getTemplateId());
+ List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
+ // 先保存结果记录
+ SmsResult smsResult = saveSendResult(null,null,request, templateContent.size());
+ List<SmsRecord> smsRecordList = new ArrayList<>();
+ List<MessageRecord> messageRecordList = new ArrayList<>();
+ // 遍历处理
+ for (List<String> list : templateContent) {
+ // 设置站内信记录信息
+ MessageRecord messageRecord = new MessageRecord();
+ messageRecord.setTheme(alarmRule.getRuleName());
+ messageRecord.setSender(AuthUtil.getUserId().toString());
+ messageRecord.setSource("智能告警");
+ messageRecord.setStatus(0);
+
+ AlarmRecordDetail alarmRecordDetail = new AlarmRecordDetail();
+ alarmRecordDetail.setReservoirNumber(list.get(0));
+ alarmRecordDetail.setAlarmRecordId(Long.parseLong(list.get(list.size() - 1)));
+ alarmRecordDetail.setAlarmMode("短信");
+ // 删除 最后一个 告警记录id
+ list.remove(list.size() - 1);
+ // 删除 0 水库编码
+ list.remove(0);
+ // 组装数据
+ String row = String.join(",", list);
+ String[] titleArr = smsRequestTemplate.getTitle().split(",");
+ String[][] dyns = new String[2][titleArr.length];
+ dyns[0] = titleArr;
+ dyns[1] = row.split(",");
+ //请求参数
+ ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
+
+ SmsRecord smsRecord = new SmsRecord();
+ if (null != smsResult){
+ alarmRecordDetail.setPhone(list.get(0));
+ // 设置手机号
+ request.setUserNumber(list.get(0));
+ messageRecord.setRecipient(list.get(0));
+ // 内容处理
+ String s = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
+ // 短信内容拼接（完成发送的结果信息）
+ // 需要删除最前面的手机号
+ list.remove(0);
+ // 格式转换
+ String format = String.format(s, list.toArray());
+ // 设置内容
+ request.setMessageContent(format);
+ messageRecord.setContent(format);
+ messageRecordList.add(messageRecord);
+ // 保存短信发送记录
+ smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
+ if (null != smsRecord){
+ alarmRecordDetail.setAlarmContent(format);
+ alarmRecordDetail.setSendRecordId(smsRecord.getId());
+ alarmRecordDetail.setCreateTime(new Date());
+ // 保存告警记录详情信息
+ boolean save = alarmRecordDetailService.save(alarmRecordDetail);
+ }
+ }
+ smsRecordList.add(smsRecord);
+ }
+ if (smsRequestTemplate.getIsSendStation()) {
+ // 保存站内信信息
+ noticeHandle.saveMessageRecord(messageRecordList);
+ }
+ Map<String, Object> map = new HashMap<>(2);
+ map.put("smsRecord",smsRecordList.size());
+ // 返回
+ return map;
+ }
+
// /**
-// * 发送 具名 变量模板短信（告警定制）
+// * 发送 具名 变量模板短信（告警定制）--动态批量发送
// * @param smsRequestTemplate
// * @return
// */
@@ -113,93 +203,29 @@
// SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
// request.setTemplateId(smsTemplate.getTemplateId());
// List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
-// // 先保存结果记录
-// SmsResult smsResult = saveSendResult(null,null,request, templateContent.size());
-// List<SmsRecord> smsRecordList = new ArrayList<>();
-// // 遍历处理
-// for (List<String> list : templateContent) {
-// AlarmRecordDetail alarmRecordDetail = new AlarmRecordDetail();
-// alarmRecordDetail.setReservoirNumber(list.get(0));
-// alarmRecordDetail.setAlarmRecordId(Long.parseLong(list.get(list.size() - 1)));
-// alarmRecordDetail.setAlarmMode("短信");
-// // 删除 最后一个 告警记录id
-// list.remove(list.size() - 1);
-// // 删除 0 水库编码
-// list.remove(0);
-// // 转换字符串
-// String row = String.join(",", list);
-// // 组装数据
-// String[][] dyns = new String[][]{{smsRequestTemplate.getTitle()}, {row}};
-// //请求参数
-// ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
-//
-// SmsRecord smsRecord = new SmsRecord();
-// if (null != smsResult){
-// alarmRecordDetail.setPhone(list.get(0));
-// // 设置手机号
-// request.setUserNumber(list.get(0));
-// // 内容处理
-// String s = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
-// // 短信内容拼接（完成发送的结果信息）
-// // 需要删除最前面的手机号
-// list.remove(0);
-// // 格式转换
-// String format = String.format(s, list.toArray());
-// // 设置内容
-// request.setMessageContent(format);
-// // 保存短信发送记录
-// smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
-// if (null != smsRecord){
-// alarmRecordDetail.setAlarmContent(format);
-// alarmRecordDetail.setSendRecordId(smsRecord.getId());
-// alarmRecordDetail.setCreateTime(new Date());
-// // 保存告警记录详情信息
-// boolean save = alarmRecordDetailService.save(alarmRecordDetail);
-// }
-// }
-// smsRecordList.add(smsRecord);
+// // 判断 templateContent 个数，个数超过1000 需要分段发送短信
+// List<List<List<String>>> lists = Lists.partition(templateContent, 1000);
+// int number = 0;
+// for (List<List<String>> list : lists) {
+// // 临时保存告警记录用
+// List<List<String>> templateList = getAlarmList(list);
+// // 批量发送短信
+// Map<String, Object> map = batchSendAlertsSms(smsRequestTemplate.getSmsTemplate(), list);
+// int count = Integer.parseInt(map.get("errCount").toString());
+// ComResult<DynSMSSendDataResult> resultComResult =(ComResult<DynSMSSendDataResult>) map.get("resultComResult");
+// // 保存短信结果记录
+// SmsResult smsResult = saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, list.size() - count);
+// // 保存详情记录（短信详情，告警详情）
+// List<SmsRecord> smsRecordList = saveAlertsAndSmsDetail(smsResult,resultComResult,smsRequestTemplate.getSmsTemplate(), templateList,request);
+// // number 累加
+// number += smsRecordList.size();
// }
-// Map<String, Object> map = new HashMap<>(2);
-// map.put("smsRecord",smsRecordList.size());
+// // 设置返回数据
+// Map<String, Object> params = new HashMap<>(1);
+// params.put("sendNumber",number);
// // 返回
-// return map;
+// return params;
// }
-
- /**
- * 发送 具名 变量模板短信（告警定制）
- * @param smsRequestTemplate
- * @return
- */
- @Override
- public Map<String, Object> sendSignMsg(SmsRequestTemplate smsRequestTemplate) {
- // 取出数据
- SMSSendRequest request = new SMSSendRequest();
- SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
- request.setTemplateId(smsTemplate.getTemplateId());
- List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
- // 判断 templateContent 个数，个数超过1000 需要分段发送短信
- List<List<List<String>>> lists = Lists.partition(templateContent, 1000);
- int number = 0;
- for (List<List<String>> list : lists) {
- // 临时保存告警记录用
- List<List<String>> templateList = getAlarmList(list);
- // 批量发送短信
- Map<String, Object> map = batchSendAlertsSms(smsRequestTemplate.getSmsTemplate(), list);
- int count = Integer.parseInt(map.get("errCount").toString());
- ComResult<DynSMSSendDataResult> resultComResult =(ComResult<DynSMSSendDataResult>) map.get("resultComResult");
- // 保存短信结果记录
- SmsResult smsResult = saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, list.size() - count);
- // 保存详情记录（短信详情，告警详情）
- List<SmsRecord> smsRecordList = saveAlertsAndSmsDetail(smsResult,resultComResult,smsRequestTemplate.getSmsTemplate(), templateList,request);
- // number 累加
- number += smsRecordList.size();
- }
- // 设置返回数据
- Map<String, Object> params = new HashMap<>(1);
- params.put("sendNumber",number);
- // 返回
- return params;
- }
/**
* 获取用户告警的集合
@@ -312,66 +338,6 @@
map.put("resultComResult",resultComResult);
map.put("errCount",count);
//返回
- return map;
- }
-
- /**
- * 保存站内信记录信息
- * @param smsRequestTemplate
- * @return
- */
- @Override
- public Map<String, Object> saveInStationInfo(SmsRequestTemplate smsRequestTemplate) {
- // 取出数据
- SMSSendRequest request = new SMSSendRequest();
- SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
- request.setTemplateId(smsTemplate.getTemplateId());
- List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
- // 先保存结果记录
- SmsResult smsResult = saveSendResult(null,null,request, templateContent.size());
- List<SmsRecord> smsRecordList = new ArrayList<>();
- // 遍历处理
- for (List<String> list : templateContent) {
- AlarmRecordDetail alarmRecordDetail = new AlarmRecordDetail();
- alarmRecordDetail.setReservoirNumber(list.get(0));
- alarmRecordDetail.setAlarmRecordId(Long.parseLong(list.get(list.size() - 1)));
- alarmRecordDetail.setAlarmMode("站内信");
- // 未读
- alarmRecordDetail.setStatus(1);
- // 删除 最后一个 告警记录id
- list.remove(list.size() - 1);
- // 删除 0 水库编码
- list.remove(0);
-
- SmsRecord smsRecord = new SmsRecord();
- if (null != smsResult){
- alarmRecordDetail.setPhone(list.get(0));
- // 设置手机号
- request.setUserNumber(list.get(0));
- // 内容处理
- String s = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
- // 需要删除最前面的手机号
- list.remove(0);
- // 格式转换
- String format = String.format(s, list.toArray());
- // 设置内容
- request.setMessageContent(format);
- // 保存记录
- smsRecord = saveSendRecord(request, "", "", smsResult.getId());
- if (null != smsRecord){
- alarmRecordDetail.setAlarmContent(format);
- alarmRecordDetail.setSendRecordId(smsRecord.getId());
- alarmRecordDetail.setCreateTime(new Date());
- // 保存告警记录详情信息
- boolean save = alarmRecordDetailService.save(alarmRecordDetail);
- }
- }
- smsRecordList.add(smsRecord);
- }
- Map<String, Object> map = new HashMap<>(2);
- map.put("smsRecord",smsRecordList);
- map.put("smsResult",smsResult);
- // 返回
return map;
}
@@ -564,7 +530,10 @@
*/
private ComResult<DynSMSSendDataResult> sendDynSMSSendDataResultComResult(String templateId, String[][] dyns) {
//请求参数
+// DynSMSSendRequestDTO sendRequest = new DynSMSSendRequestDTO();
DynSMSSendRequest sendRequest = new DynSMSSendRequest();
+ // 相同号码，不同内容，不需要去重处理--暂时不用，等短信厂家通知，未上线 2023.07.07
+// sendRequest.setDuplicateRemoval("1");
sendRequest.setTemplateId(templateId);
sendRequest.setDynData(dyns);
// 发送
--
Gitblit v1.9.3