From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java | 193 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 193 insertions(+), 0 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 deacf38..d342442 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
@@ -18,6 +18,7 @@
import cn.gistack.alerts.sms.entity.SmsResult;
import cn.gistack.alerts.sms.entity.SmsTemplate;
import cn.gistack.alerts.sms.excel.SendRainSmsExcel;
+import cn.gistack.alerts.sms.excel.SendSmsExcel;
import cn.gistack.alerts.sms.service.ISmsRecordService;
import cn.gistack.alerts.sms.service.ISmsResultService;
import cn.gistack.alerts.sms.service.ISmsTemplateService;
@@ -27,12 +28,14 @@
import cn.gistack.alerts.sms.vo.SmsResponseVO;
import cn.gistack.alerts.sms.vo.Temp;
import cn.gistack.sm.intelligentCall.entity.CallNotFillRecord;
+import cn.gistack.sm.intelligentCall.excel.CallExcel;
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 com.google.common.collect.Sets;
import org.jetbrains.annotations.NotNull;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.utils.AuthUtil;
@@ -848,6 +851,112 @@
});
}
+// /**
+// * 发送合并水库名短信
+// * @param smsRequestTemplate
+// */
+// @Override
+// public void sendMergeSignMsg(SmsRequestTemplate smsRequestTemplate) {
+// // 取出数据
+// SMSSendRequest request = new SMSSendRequest();
+// SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
+// request.setTemplateId(smsTemplate.getTemplateId());
+// List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
+// List<Temp> tempList = new ArrayList<>();
+// // 合并数据
+// for (List<String> list : templateContent) {
+// Temp temp = new Temp();
+// temp.setPhone(list.get(1));
+// temp.setReservoirCode(list.get(0));
+// temp.setReservoirName(list.get(3));
+// temp.setAlarmRecordId(list.get(list.size()-1));
+// // 放入临时集合
+// tempList.add(temp);
+// }
+// // 按手机号分组
+// Map<String, List<Temp>> listMap = tempList.stream().collect(Collectors.groupingBy(Temp::getPhone));
+// // 短信发送行数据
+// List<String> rowList = new ArrayList<>();
+// // 告警记录详情数据
+// List<AlarmRecordDetailVO> alarmRecordDetailList = new ArrayList<>();
+// // 遍历 map 发送短信，组装数据
+// listMap.forEach((s, temps) -> {
+// StringBuilder builder = new StringBuilder();
+// StringBuilder smsRecordBuilder = new StringBuilder();
+// builder.append(s).append(",");
+// // 如果一人对应水库数量超过30个，则分批发送
+// List<List<Temp>> lists = Lists.partition(new ArrayList<>(temps), 30);
+// for (List<Temp> list : lists) {
+// // 遍历
+// for (Temp temp : list) {
+// builder.append(temp.getReservoirName()).append("，");
+// smsRecordBuilder.append(temp.getReservoirName()).append("，");
+// AlarmRecordDetailVO alarmRecordDetail = new AlarmRecordDetailVO();
+// alarmRecordDetail.setReservoirNumber(temp.getReservoirCode());
+// alarmRecordDetail.setAlarmRecordId(Long.parseLong(temp.getAlarmRecordId()));
+// alarmRecordDetail.setAlarmMode("短信");
+// alarmRecordDetail.setPhone(temp.getPhone());
+// alarmRecordDetail.setReservoirName(temp.getReservoirName());
+// // 加入集合
+// alarmRecordDetailList.add(alarmRecordDetail);
+// }
+// String row = builder.substring(0, builder.length() - 1);
+// rowList.add(row);
+// }
+// });
+// // 批量发送短信
+// mergeBatchSendSms(smsRequestTemplate,request,smsTemplate,rowList,alarmRecordDetailList);
+// }
+
+ /**
+ * 批量发送合并水库的短信
+ */
+ public void mergeBatchSendSms(SmsRequestTemplate smsRequestTemplate,
+ SMSSendRequest request,
+ SmsTemplate smsTemplate,
+ List<String> rowList,
+ List<AlarmRecordDetailVO> alarmRecordDetailList) {
+ // 组装数据
+ String[] titleArr = smsRequestTemplate.getTitle().split(",");
+ String[][] dyns = new String[rowList.size() + 1][titleArr.length];
+ dyns[0] = titleArr;
+ int rowNum = 1;
+ for (String row : rowList) {
+ String[] cols = row.split(",");
+ dyns[rowNum++] = cols;
+ }
+ //请求参数
+ ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
+ // 先保存结果记录
+ SmsResult smsResult = saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, rowList.size());
+ List<AlarmRecordDetail> alarmRecordDetailArrayList = new ArrayList<>();
+ // 遍历
+ for (AlarmRecordDetailVO alarmRecordDetailVO : alarmRecordDetailList) {
+ // 设置手机号
+ request.setUserNumber(alarmRecordDetailVO.getPhone());
+ // 内容处理
+ String str = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
+ // 格式转换
+ String formatContent = String.format(str, alarmRecordDetailVO.getReservoirName().split(","));
+ // 设置内容
+ request.setMessageContent(formatContent);
+ // 保存短信发送记录
+ SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
+ AlarmRecordDetail alarmRecordDetail1 = new AlarmRecordDetail();
+ // 短信内容拼接（完成发送的结果信息）
+ alarmRecordDetail1.setAlarmContent(formatContent);
+ alarmRecordDetail1.setSendRecordId(smsRecord.getId());
+ alarmRecordDetail1.setCreateTime(new Date());
+ alarmRecordDetail1.setReservoirNumber(alarmRecordDetailVO.getReservoirNumber());
+ alarmRecordDetail1.setAlarmRecordId(alarmRecordDetailVO.getAlarmRecordId());
+ alarmRecordDetail1.setAlarmMode(alarmRecordDetailVO.getAlarmMode());
+ alarmRecordDetail1.setPhone(alarmRecordDetailVO.getPhone());
+ alarmRecordDetailArrayList.add(alarmRecordDetail1);
+ }
+ // 保存告警记录详情信息
+ boolean save = alarmRecordDetailService.saveBatch(alarmRecordDetailArrayList);
+ }
+
/**
* 批量发送短信（集合数据）
* @param map (保护参数 1:短信模板id 2:数据集合 list<Map<String,Object>>)
@@ -874,4 +983,88 @@
// 返回
return batchSendSmsMap;
}
+
+ /**
+ * 导入表格发送预警短信
+ * @param list 集合数据
+ * @param templateId 模板id
+ * @param param 通用参数
+ * @param content 发送内容
+ * @return
+ */
+ @Override
+ public Object importSendSms(List<SendSmsExcel> list,String templateId,String param, String content) {
+ // 查询短信模板
+ SmsTemplate smsTemplate = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("template_id", templateId));
+ // 判断模板是否为具名变量模板（目前已筛选出都是具名变量模板）
+ // 判断模板中是否包含参数，如果无参数，对比是否传参数
+ boolean validate = validatorParam(smsTemplate,param);
+ if (!validate){
+ return R.data(400,"参数个数不对应，请检查后修改导入!",null);
+ }
+ // 转换
+ List<String> stringList = list.stream().map(SendSmsExcel::getPhone).collect(Collectors.toList());
+ // 获取水库个数
+ List<String> errPhones = new ArrayList<>();
+ // 去重
+ Set<String> hashSet = new HashSet<>(stringList);
+ // 拼接短信标题数组
+ String [] titleArr = getSmsTitleArr(smsTemplate);
+ // 批量发送不能超过1000 个号码，需分组发送
+ List<String> arrayList = new ArrayList<>(hashSet);
+ List<List<String>> partition = Lists.partition(arrayList, 1000);
+ int i = 0;
+ String errMsg = "";
+ for (List<String> phoneList : partition) {
+ HashSet<String> sets = new HashSet<>(phoneList);
+ // 批量发送短信
+ Map<String, Object> batchSendSmsMap = batchSendSms(sets, titleArr, param, smsTemplate,errPhones);
+ // 取出发送结果
+ ComResult<DynSMSSendDataResult> resultComResult = (ComResult<DynSMSSendDataResult>) batchSendSmsMap.get("resultComResult");
+ //
+ if(!resultComResult.getCode().equals(0)){
+ i++;
+ errMsg = resultComResult.getMsg();
+ break;
+ }
+ }
+ if (i>0){
+ // 返回resultComResult
+ return R.data(400,"发送失败!" + errMsg,null);
+ }
+ // 返回resultComResult
+ return R.data(200,"发送成功!",null);
+ }
+
+ /**
+ * 校验参数
+ * @param smsTemplate
+ * @param param
+ */
+ private boolean validatorParam(SmsTemplate smsTemplate, String param) {
+ int length = 0;
+ if (null!= param && !param.equals("")) {
+ length = Arrays.asList(param.split(",")).size();
+ }
+ // 解析模板
+ String str = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
+ int countChar = countChar(str, '%');
+ if (length==countChar){
+ return true;
+ }else {
+ return false;
+ }
+ }
+
+ /**
+ * 计算某个字符在字符串中的个数
+ * @param str 字符串
+ * @param target 字符
+ * @return
+ */
+ public int countChar(String str, char target) {
+ String targetStr = String.valueOf(target);
+ String replacedStr = str.replaceAll(targetStr, "");
+ return str.length() - replacedStr.length();
+ }
}
--
Gitblit v1.9.3