From 6735eaad855055d7a7e1149f3a01ebff1e29005b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 26 Jul 2023 16:00:43 +0800
Subject: [PATCH] 雨量大雨，暴雨，6小时告警新增
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java | 127 +++++++++++++++++++++++++-----------------
1 files changed, 75 insertions(+), 52 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 c8a7038..a36b5da 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
@@ -274,49 +274,52 @@
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);
- SmsRecord smsRecord = new SmsRecord();
- if (null != smsResult){
- alarmRecordDetail.setPhone(list.get(0));
- messageRecord.setRecipient(list.get(0));
- // 设置手机号
- request.setUserNumber(list.get(0));
- // 内容处理
- String s = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
- // 短信内容拼接（完成发送的结果信息）
- // 需要删除最前面的手机号
+ // 校验手机号，发送短信时已校验
+ if (validator(list.get(1))) {
+ // 设置站内信记录信息
+ 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 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);
+ SmsRecord smsRecord = new SmsRecord();
+ if (null != smsResult) {
+ alarmRecordDetail.setPhone(list.get(0));
+ messageRecord.setRecipient(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);
+ 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);
}
- smsRecordList.add(smsRecord);
}
if (isSendStation) {
// 保存站内信信息
@@ -779,19 +782,13 @@
Map<String, List<Temp>> listMap = tempList.stream().collect(Collectors.groupingBy(Temp::getPhone));
// 遍历 map 发送短信
listMap.forEach((s, temps) -> {
-
- List<AlarmRecordDetailVO> alarmRecordDetailList = new ArrayList<>();
StringBuilder builder = new StringBuilder();
StringBuilder smsRecordBuilder = new StringBuilder();
builder.append(s).append(",");
- // 水库去重
-// List<Temp> tempListNew = temps.stream().collect(
-// Collectors.collectingAndThen(
-// Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Temp::getReservoirCode))), ArrayList::new)
-// );
// 如果一人对应水库数量超过30个，则分批发送
List<List<Temp>> lists = Lists.partition(new ArrayList<>(temps), 30);
for (List<Temp> list : lists) {
+ List<AlarmRecordDetailVO> alarmRecordDetailList = new ArrayList<>();
// 遍历
for (Temp temp : list) {
builder.append(temp.getReservoirName()).append("，");
@@ -830,17 +827,43 @@
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(","));
- alarmRecordDetail.setAlarmContent(formatContent);
- alarmRecordDetail.setSendRecordId(smsRecord.getId());
- alarmRecordDetail.setCreateTime(new Date());
- // 保存告警记录详情信息
- boolean save = alarmRecordDetailService.save(alarmRecordDetail);
+ 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);
}
}
});
}
+
+ /**
+ * 批量发送短信（集合数据）
+ * @param map (保护参数 1:短信模板id 2:数据集合 list<Map<String,Object>>)
+ * @return
+ */
+ @Override
+ public Object batchSendSms(Map<String, Object> map) {
+ // 获取模板id
+ String templateId = map.get("templateId").toString();
+ // 获取集合数据
+ List<Map<String,Object>> list = (List<Map<String,Object>>) map.get("list");
+ List<String> columnList = (List<String>) map.get("columnList");
+ // 遍历
+ for (Map<String, Object> param : list) {
+ // 放入集合数据
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3