From 4fa63d4db1e87adabe5b40a4d5fb4e8b10276def Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 22 Aug 2024 09:07:24 +0800
Subject: [PATCH] 错误修正
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java | 205 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 163 insertions(+), 42 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
index 65b02be..d9e4e43 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
@@ -16,6 +16,7 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
+import java.time.LocalTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -63,6 +64,9 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if (!isTimeSend()) return;
+
// 调用短信服务
smsService.sendMergeSignMsg(smsRequestTemplate);
}
@@ -113,6 +117,8 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if (!isTimeSend()) return map;
// 调用短信服务
map = smsService.sendSignMsg(smsRequestTemplate);
// 返回
@@ -165,6 +171,8 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if(!isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -215,6 +223,9 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if (!isTimeSend()) return map;
+
// 调用短信服务
map = smsService.sendSignMsg(smsRequestTemplate);
return map;
@@ -269,6 +280,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
// 调用短信服务
map = smsService.sendSignMsg(smsRequestTemplate);
return map;
@@ -322,6 +334,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
// 调用短信服务
map = smsService.sendSignMsg(smsRequestTemplate);
return map;
@@ -375,6 +388,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
// 调用短信服务
map = smsService.sendSignMsg(smsRequestTemplate);
return map;
@@ -426,6 +440,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
// 调用短信服务
// map = smsService.sendSignMsg(smsRequestTemplate);
return map;
@@ -472,6 +487,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -508,13 +524,18 @@
if (smsRequestTemplate.getPersonVOList().size() > 0) {
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 拼接市县水利部人员姓名及联系方式
- noticeHandle.addCityCountyBusinessPersonInfo(list);
+// noticeHandle.addCityCountyBusinessPersonInfo(list);
+ String remark = StringUtil.format("降雨：{}\n",
+ list.get(6) + "毫米"
+ );
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
}
+
+ if(!isTimeSend()) return map;
List<String> list = noticeHandle.createOutCallTaskByAlarm(smsRequestTemplate);
map.put("list", list);
// 调用短信服务
@@ -561,6 +582,8 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if (!isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -613,6 +636,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -657,6 +681,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -709,6 +734,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -752,6 +778,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -804,6 +831,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -855,6 +883,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -903,6 +932,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -952,6 +982,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -994,7 +1025,9 @@
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
- String remark = list.get(9);
+ String remark = StringUtil.format("降雨：{}\n",
+ list.get(6) + "毫米"
+ );
// 保存告警记录信息
AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
@@ -1002,6 +1035,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1045,6 +1079,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1088,7 +1123,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1117,7 +1152,7 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
@@ -1141,7 +1176,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 需要合并水库保存站内信记录信息
noticeHandle.saveInStationInfoMerge(smsRequestTemplate, alarmRule);
}
@@ -1165,7 +1200,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1191,7 +1226,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1231,7 +1266,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1269,7 +1304,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1307,7 +1342,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
// map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1344,7 +1379,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1377,7 +1412,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1417,7 +1452,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1451,7 +1486,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1489,7 +1524,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1523,7 +1558,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1563,7 +1598,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1608,7 +1643,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1669,7 +1704,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1707,7 +1742,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1760,7 +1795,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1798,7 +1833,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1843,7 +1878,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1881,7 +1916,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1915,7 +1950,7 @@
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
- String remark = StringUtil.format("de_val：{}\ndn_val：{}\ndu_value：{}\n",
+ String remark = StringUtil.format("上下游：{}\n左右岸：{}\n垂直位移：{}\n",
list.get(13), list.get(14), list.get(15)
);
list.remove(13);
@@ -1928,7 +1963,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1966,7 +2001,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1999,7 +2034,7 @@
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
- String remark = StringUtil.format("de_val：{}\ndn_val：{}\ndu_value：{}\n",
+ String remark = StringUtil.format("上下游：{}\n左右岸：{}\n垂直位移：{}\n",
list.get(13), list.get(14), list.get(15)
);
list.remove(13);
@@ -2012,7 +2047,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2044,13 +2079,21 @@
noticeHandle.addPatrolTechnologyInfo(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ String remark = StringUtil.format("上下游：{}\n左右岸：{}\n垂直位移：{}\n",
+ list.get(13), list.get(14), list.get(15)
+ );
+ list.remove(13);
+ list.remove(14);
+ list.remove(15);
+
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -2082,13 +2125,21 @@
noticeHandle.addPatrolTechnologyInfo(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ String remark = StringUtil.format("上下游：{}\n左右岸：{}\n垂直位移：{}\n",
+ list.get(13), list.get(14), list.get(15)
+ );
+ list.remove(13);
+ list.remove(14);
+ list.remove(15);
+
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2129,7 +2180,7 @@
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -2168,7 +2219,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2208,7 +2259,7 @@
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -2254,7 +2305,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2286,7 +2337,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfoMergeNoCd(smsRequestTemplate, alarmRule);
}
@@ -2320,7 +2371,7 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfoMergeVideo(smsRequestTemplate, alarmRule);
}
@@ -2340,7 +2391,7 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 调用短信服务
smsService.sendMergeSignMsg(smsRequestTemplate);
}
@@ -2368,11 +2419,81 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsgMergeCdVideo(smsRequestTemplate);
// 调用短信服务
return map;
}
return map;
}
+
+ /**
+ * 策略42 站内信----- 超防洪高水位告警
+ *
+ * @param alarmRule 告警规则
+ * @param alarmRuleDetail 告警规则详情
+ * @param ztData 中台数据
+ * @param columnList 需要展示的数据字段
+ * @param flag 是否显示日期
+ * @param adCode 行政区划
+ * @param isSendStation 是否站内信
+ * @param uuid 随机生成id
+ * @return
+ */
+ public void topLevOfFloAlertHandleStation(AlarmRule alarmRule,
+ AlarmRuleDetail alarmRuleDetail,
+ JSONArray data,
+ List<String> columnList,
+ boolean flag,
+ String adCode,
+ boolean isSendStation,
+ String uuid,
+ String isDay
+ ) {
+ SmsRequestTemplate smsRequestTemplate
+ = noticeHandle.getSendSmsTemplate(data, alarmRule, alarmRuleDetail, columnList, flag, adCode, uuid, isSendStation);
+ // 拼接后面内容
+ if (smsRequestTemplate.getPersonVOList().size() > 0) {
+ for (List<String> list : smsRequestTemplate.getTemplateContent()) {
+ String remark = StringUtil.format("水位：{}\n防洪高水位：{}米\n超防洪高水位：{}米\n",
+ list.get(9), list.get(13), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(13)))
+ );
+ list.remove(13);
+ System.out.println(remark);
+ // 依次添加行政责任人,主管部门责任人,技术责任人,巡查责任人信息(姓名，联系电话)
+ noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
+ // 拼接市县水利部人员姓名及联系方式
+ noticeHandle.addCityCountyBusinessPersonInfo(list);
+ // 保存告警记录信息
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid,remark);
+ if (null != alarmRecord) {
+ list.add(alarmRecord.getId().toString());
+ }
+ }
+
+ //如果参数是day，表示是每天生成告警，不需要发信息
+ if (isDay.equals("day") || !isTimeSend()) return;
+ // 保存站内信记录信息
+ noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
+ }
+ }
+
+ /**
+ * 是否在时间范围内发送
+ * @return
+ */
+ private boolean isTimeSend(){
+ boolean flag = false;
+ // 判断时间范围
+ // 开始时间
+ LocalTime startTime = LocalTime.parse("08:00");
+ // 结束时间
+ LocalTime endTime = LocalTime.parse("22:00");
+ // 当前时间
+ LocalTime now = LocalTime.now();
+ // 比较
+ flag = !now.isBefore(startTime) && !now.isAfter(endTime);
+ // 返回
+ return flag;
+ }
}
--
Gitblit v1.9.3