From cf119adeab46dcc843c4c7b28a719a0c027d7c88 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 26 Jul 2024 15:13:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java | 121 ++++++++++++++++++++++++++++------------
1 files changed, 85 insertions(+), 36 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 d9df36b..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;
@@ -518,6 +534,8 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if(!isTimeSend()) return map;
List<String> list = noticeHandle.createOutCallTaskByAlarm(smsRequestTemplate);
map.put("list", list);
// 调用短信服务
@@ -564,6 +582,8 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if (!isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -616,6 +636,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -660,6 +681,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -712,6 +734,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -755,6 +778,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -807,6 +831,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -858,6 +883,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -906,6 +932,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -955,6 +982,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1007,6 +1035,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1050,6 +1079,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1093,7 +1123,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1122,7 +1152,7 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
@@ -1146,7 +1176,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 需要合并水库保存站内信记录信息
noticeHandle.saveInStationInfoMerge(smsRequestTemplate, alarmRule);
}
@@ -1170,7 +1200,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1196,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;
@@ -1236,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;
@@ -1274,7 +1304,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1312,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;
@@ -1349,7 +1379,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1382,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;
@@ -1422,7 +1452,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1456,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;
@@ -1494,7 +1524,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1528,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;
@@ -1568,7 +1598,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1613,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;
@@ -1674,7 +1704,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1712,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;
@@ -1765,7 +1795,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1803,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;
@@ -1848,7 +1878,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1886,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;
@@ -1933,7 +1963,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1971,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;
@@ -2017,7 +2047,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2063,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;
@@ -2109,7 +2139,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2150,7 +2180,7 @@
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -2189,7 +2219,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2229,7 +2259,7 @@
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -2275,7 +2305,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2307,7 +2337,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfoMergeNoCd(smsRequestTemplate, alarmRule);
}
@@ -2341,7 +2371,7 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfoMergeVideo(smsRequestTemplate, alarmRule);
}
@@ -2361,7 +2391,7 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 调用短信服务
smsService.sendMergeSignMsg(smsRequestTemplate);
}
@@ -2389,7 +2419,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsgMergeCdVideo(smsRequestTemplate);
// 调用短信服务
return map;
@@ -2442,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