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 | 128 ++++++++++++++++++++++++++++++------------
1 files changed, 90 insertions(+), 38 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 1c08543..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;
@@ -1004,6 +1035,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1047,6 +1079,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1090,7 +1123,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1119,7 +1152,7 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
@@ -1143,7 +1176,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 需要合并水库保存站内信记录信息
noticeHandle.saveInStationInfoMerge(smsRequestTemplate, alarmRule);
}
@@ -1167,7 +1200,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1193,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;
@@ -1233,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;
@@ -1271,7 +1304,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1309,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;
@@ -1346,7 +1379,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1379,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;
@@ -1419,7 +1452,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1453,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;
@@ -1491,7 +1524,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1525,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;
@@ -1565,7 +1598,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1610,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;
@@ -1671,7 +1704,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1709,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;
@@ -1762,7 +1795,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1800,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;
@@ -1845,7 +1878,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1883,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;
@@ -1930,7 +1963,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1968,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;
@@ -2014,7 +2047,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2060,7 +2093,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;
@@ -2106,7 +2139,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2147,7 +2180,7 @@
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -2186,7 +2219,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2226,7 +2259,7 @@
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -2272,7 +2305,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2304,7 +2337,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfoMergeNoCd(smsRequestTemplate, alarmRule);
}
@@ -2338,7 +2371,7 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfoMergeVideo(smsRequestTemplate, alarmRule);
}
@@ -2358,7 +2391,7 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 调用短信服务
smsService.sendMergeSignMsg(smsRequestTemplate);
}
@@ -2386,7 +2419,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsgMergeCdVideo(smsRequestTemplate);
// 调用短信服务
return map;
@@ -2439,9 +2472,28 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ 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