From f2d0713c2b20a6c751399e2468996eafb8812988 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 18 Apr 2024 10:37:13 +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 | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 238 insertions(+), 2 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 d342442..df9fa08 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
@@ -300,7 +300,7 @@
messageRecord.setRecipient(list.get(0));
// 设置手机号
request.setUserNumber(list.get(0));
- // 内容处理
+ // 内容处理，把括号内容换成%s,后面用format替换，因此括号内容要和list的个数一样
String s = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
// 短信内容拼接（完成发送的结果信息）
// 需要删除最前面的手机号
@@ -776,7 +776,7 @@
Temp temp = new Temp();
temp.setPhone(list.get(1));
temp.setReservoirCode(list.get(0));
- temp.setReservoirName(list.get(3));
+ temp.setReservoirName(list.get(2));
temp.setAlarmRecordId(list.get(list.size()-1));
// 放入临时集合
tempList.add(temp);
@@ -850,6 +850,241 @@
}
});
}
+
+
+
+ @Override
+ public Map<String, Object> sendSignMsgMergeCd(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(2));
+ temp.setCdNm(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));
+ // 遍历 map 发送短信
+ listMap.forEach((s, temps) -> {
+ StringBuilder builder = new StringBuilder();
+ StringBuilder smsRecordBuilder = new StringBuilder();
+ builder.append(s).append(",");
+
+ //按水库再次分组，因为要把测点名称放进水库里
+ Map<String, List<Temp>> resCollectGroup = temps.stream().collect(Collectors.groupingBy(Temp::getReservoirCode));
+
+ //这个集合为了存水库和其多个测站
+ List<Temp> infoList = new ArrayList<>();
+ resCollectGroup.forEach((resCode,temp1)->{
+ Temp temp = new Temp();
+ temp.setPhone(s);
+ temp.setReservoirName(temp1.get(0).getReservoirName());
+ temp.setReservoirCode(resCode);
+ List<String> cdNameList = new ArrayList<>();
+ temp1.forEach(info->{
+ cdNameList.add("测点" + info.getCdNm());
+ temp.setAlarmRecordId(info.getAlarmRecordId());
+ });
+ temp.setCdNm(String.join("、",cdNameList));
+ infoList.add(temp);
+ });
+
+
+ // 如果一人对应水库数量超过30个，则分批发送
+ List<List<Temp>> lists = Lists.partition(new ArrayList<>(infoList), 30);
+ for (List<Temp> list : lists) {
+ List<AlarmRecordDetailVO> alarmRecordDetailList = new ArrayList<>();
+ // 遍历
+ for (Temp temp : list) {
+ builder.append(temp.getReservoirName()+"("+temp.getCdNm() +")").append("，");
+ smsRecordBuilder.append(temp.getReservoirName()+"("+temp.getCdNm() +")").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);
+ // 组装数据
+ 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);
+ // 先保存结果记录
+ SmsResult smsResult = saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
+ // 设置手机号
+ request.setUserNumber(s);
+ // 内容处理
+ String str = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
+ // 短信内容拼接（完成发送的结果信息）
+ String substring = smsRecordBuilder.substring(0, smsRecordBuilder.length() - 1);
+ // 格式转换
+ String format = String.format(str, substring.split(","));
+ // 设置内容
+ request.setMessageContent(format);
+ // 保存短信发送记录
+ SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
+ //保存告警记录详情信息
+ if (null != smsRecord) {
+ List<AlarmRecordDetail> alarmRecordDetailArrayList = new ArrayList<>();
+ for (AlarmRecordDetailVO alarmRecordDetail : alarmRecordDetailList) {
+ AlarmRecordDetail alarmRecordDetail1 = new AlarmRecordDetail();
+ // 短信内容拼接（完成发送的结果信息）
+// String formatContent = String.format(str, alarmRecordDetail.getReservoirName().split(","));
+ String formatContent = format;
+ alarmRecordDetail1.setAlarmContent(formatContent);
+ alarmRecordDetail1.setSendRecordId(smsRecord.getId());
+ alarmRecordDetail1.setCreateTime(new Date());
+ alarmRecordDetail1.setReservoirNumber(alarmRecordDetail.getReservoirNumber());
+ alarmRecordDetail1.setAlarmRecordId(alarmRecordDetail.getAlarmRecordId());
+ alarmRecordDetail1.setAlarmMode(alarmRecordDetail.getAlarmMode());
+ alarmRecordDetail1.setPhone(alarmRecordDetail.getPhone());
+ alarmRecordDetailArrayList.add(alarmRecordDetail1);
+ }
+ // 保存告警记录详情信息
+ try {
+ boolean save = alarmRecordDetailService.saveBatch(alarmRecordDetailArrayList);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }
+ });
+
+ return null;
+ }
+
+
+ @Override
+ public Map<String, Object> sendSignMsgMergeCdVideo(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(2));
+ temp.setCdNm(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));
+ // 遍历 map 发送短信
+ listMap.forEach((s, temps) -> {
+ StringBuilder builder = new StringBuilder();
+ StringBuilder smsRecordBuilder = new StringBuilder();
+ builder.append(s).append(",");
+
+ //按水库再次分组，因为要把测点名称放进水库里
+ Map<String, List<Temp>> resCollectGroup = temps.stream().collect(Collectors.groupingBy(Temp::getReservoirCode));
+
+ //这个集合为了存水库和其多个测站
+ List<Temp> infoList = new ArrayList<>();
+ resCollectGroup.forEach((resCode,temp1)->{
+ Temp temp = new Temp();
+ temp.setPhone(s);
+ temp.setReservoirName(temp1.get(0).getReservoirName());
+ temp.setReservoirCode(resCode);
+ List<String> cdNameList = new ArrayList<>();
+ temp1.forEach(info->{
+ cdNameList.add( info.getCdNm());
+ temp.setAlarmRecordId(info.getAlarmRecordId());
+ });
+ temp.setCdNm(String.join("、",cdNameList));
+ infoList.add(temp);
+ });
+
+
+ // 如果一人对应水库数量超过30个，则分批发送
+ List<List<Temp>> lists = Lists.partition(new ArrayList<>(infoList), 30);
+ for (List<Temp> list : lists) {
+ List<AlarmRecordDetailVO> alarmRecordDetailList = new ArrayList<>();
+ // 遍历
+ for (Temp temp : list) {
+ builder.append(temp.getReservoirName()+"("+temp.getCdNm() +")").append("，");
+ smsRecordBuilder.append(temp.getReservoirName()+"("+temp.getCdNm() +")").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);
+ // 组装数据
+ 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);
+ // 先保存结果记录
+ SmsResult smsResult = saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
+ // 设置手机号
+ request.setUserNumber(s);
+ // 内容处理
+ String str = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
+ // 短信内容拼接（完成发送的结果信息）
+ String substring = smsRecordBuilder.substring(0, smsRecordBuilder.length() - 1);
+ // 格式转换
+ String format = String.format(str, substring.split(","));
+ // 设置内容
+ request.setMessageContent(format);
+ // 保存短信发送记录
+ SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
+ //保存告警记录详情信息
+ if (null != smsRecord) {
+ List<AlarmRecordDetail> alarmRecordDetailArrayList = new ArrayList<>();
+ for (AlarmRecordDetailVO alarmRecordDetail : alarmRecordDetailList) {
+ AlarmRecordDetail alarmRecordDetail1 = new AlarmRecordDetail();
+ // 短信内容拼接（完成发送的结果信息）
+// String formatContent = String.format(str, alarmRecordDetail.getReservoirName().split(","));
+ String formatContent = format;
+ alarmRecordDetail1.setAlarmContent(formatContent);
+ alarmRecordDetail1.setSendRecordId(smsRecord.getId());
+ alarmRecordDetail1.setCreateTime(new Date());
+ alarmRecordDetail1.setReservoirNumber(alarmRecordDetail.getReservoirNumber());
+ alarmRecordDetail1.setAlarmRecordId(alarmRecordDetail.getAlarmRecordId());
+ alarmRecordDetail1.setAlarmMode(alarmRecordDetail.getAlarmMode());
+ alarmRecordDetail1.setPhone(alarmRecordDetail.getPhone());
+ alarmRecordDetailArrayList.add(alarmRecordDetail1);
+ }
+ // 保存告警记录详情信息
+ boolean save = alarmRecordDetailService.saveBatch(alarmRecordDetailArrayList);
+ }
+ }
+ });
+ return null;
+ }
+
// /**
// * 发送合并水库名短信
@@ -1036,6 +1271,7 @@
return R.data(200,"发送成功!",null);
}
+
/**
* 校验参数
* @param smsTemplate
--
Gitblit v1.9.3