From 7440ae50ede2d501324067b0af8e99a46509fa11 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Mon, 15 Jul 2024 10:15:23 +0800
Subject: [PATCH] 站内信、电话新增告警时间限制
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java | 85 +++++++++++++++++++++++++++---------------
1 files changed, 54 insertions(+), 31 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java
index 336d3bd..e1307a4 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java
@@ -16,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.time.LocalTime;
import java.util.List;
import java.util.UUID;
@@ -184,7 +185,8 @@
if (alarmRuleDetailList.size() > 0) {
// 遍历
for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ // 电话，站内信需满足规定时间范围内才发送
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.waterComeOverHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.waterComeOverList, true, adCode, true);
}
}
@@ -353,10 +355,12 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.waterComeDesignHandleBySms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.waterComeDesignList1, true, adCode, false, uuid);
}
-// if (alarmRuleDetail.getAlarmMode().equals("电话")) {
+ // 电话，站内信需满足规定时间范围内才发送
+// if (alarmRuleDetail.getAlarmMode().equals("电话") && isTimeSend()) {
// asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList2,true, adCode, false,uuid);
// }
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ // 电话，站内信需满足规定时间范围内才发送
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.waterComeDesignHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.waterComeDesignList3, true, adCode, true, uuid);
}
}
@@ -389,7 +393,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.waterMoreDesignHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.waterMoreDesignList, true, adCode, false, uuid);
}
-// if (alarmRuleDetail.getAlarmMode().equals("电话")) {
+// if (alarmRuleDetail.getAlarmMode().equals("电话") && isTimeSend()) {
// asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreDesignList,true, adCode, false,uuid);
// }
}
@@ -423,7 +427,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.waterMoreCheckHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.waterMoreCheckList, true, adCode, false, uuid);
}
-// if (alarmRuleDetail.getAlarmMode().equals("电话")) {
+// if (alarmRuleDetail.getAlarmMode().equals("电话") && isTimeSend()) {
// asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreCheckList,true, adCode, false,uuid);
// }
}
@@ -606,7 +610,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.sixHourRainHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.sixHourRainList, false, adCode, false, uuid);
}
-// if (alarmRuleDetail.getAlarmMode().equals("电话")) {
+// if (alarmRuleDetail.getAlarmMode().equals("电话") && isTimeSend()) {
// asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.sixHourRainList,true, adCode, false,uuid);
// }
}
@@ -643,7 +647,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.sixHourRainHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.sixHourRainList, false, adCode, false, uuid);
}
- if (alarmRuleDetail.getAlarmMode().equals("电话")) {
+ if (alarmRuleDetail.getAlarmMode().equals("电话") && isTimeSend()) {
asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, whztData,ZtApiDataColumnConstant.sixHourRainList,false, adCode, false,uuid);
}
}
@@ -676,7 +680,7 @@
if (alarmRuleDetailList.size() > 0) {
// 遍历
for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
- if (alarmRuleDetail.getAlarmMode().equals("短信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("短信") && isTimeSend()) {
asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.damSafetyList, true, adCode, false, uuid,arg2);
}
}
@@ -712,7 +716,7 @@
if (alarmRuleDetailList.size() > 0) {
// 遍历
for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetySyList, true, adCode, true, uuid,arg2);
}
}
@@ -750,7 +754,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid,arg2);
}
}
@@ -786,7 +790,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetyHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid,arg2);
}
}
@@ -822,7 +826,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid,arg2);
}
}
@@ -857,7 +861,7 @@
if (alarmRuleDetailList.size() > 0) {
// 遍历
for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySyDataMissingHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syDataMissingList, false, adCode, true, uuid,arg2);
}
if (alarmRuleDetail.getAlarmMode().equals("短信")){
@@ -893,7 +897,7 @@
if (alarmRuleDetailList.size() > 0) {
// 遍历
for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySyDataMissingHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.bxDataMissingList, false, adCode, true, uuid,arg2);
}
if (alarmRuleDetail.getAlarmMode().equals("短信")){
@@ -934,7 +938,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyLessThenPipeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syLessThenPipe, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySyLessThenPipeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syLessThenPipe, true, adCode, true, uuid,arg2);
}
}
@@ -976,7 +980,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyHigherThenNozzleHandleSms(alarmRule, alarmRuleDetail, resultData,ZtApiDataColumnConstant.syHigherThenNozzle,true, adCode, false,uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySyHigherThenNozzleHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenNozzle, true, adCode, true, uuid,arg2);
}
}
@@ -1016,7 +1020,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyHigherThenBdElevationHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenBdElevation, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySyHigherThenBdElevationHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenBdElevation, true, adCode, true, uuid,arg2);
}
}
@@ -1054,7 +1058,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyHigherThenWaterLevelHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenWaterLevel, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySyHigherThenWaterLevelHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenWaterLevel, true, adCode, true, uuid,arg2);
}
}
@@ -1096,7 +1100,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyYellowChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syYellowRzChange, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySyYellowChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syYellowRzChange, true, adCode, true, uuid,arg2);
}
}
@@ -1135,7 +1139,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyOrangeChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syOrangeRzChange, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySyOrangeChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syOrangeRzChange, true, adCode, true, uuid,arg2);
}
}
@@ -1174,7 +1178,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyRedChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRedRzChange, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySyRedChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRedRzChange, true, adCode, true, uuid,arg2);
}
}
@@ -1212,7 +1216,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyRz1hChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRz1hChange, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySyRz1hChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRz1hChange, true, adCode, true, uuid,arg2);
}
}
@@ -1251,7 +1255,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetyWyOver2Less5HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver2Less5, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetyWyOver2Less5HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver2Less5, true, adCode, true, uuid,arg2);
}
}
@@ -1292,7 +1296,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetyWyOver5Less10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver5Less10, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetyWyOver5Less10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver5Less10, true, adCode, true, uuid,arg2);
}
}
@@ -1334,7 +1338,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetyWyOver10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver10, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetyWyOver10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver10, true, adCode, true, uuid,arg2);
}
}
@@ -1373,7 +1377,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetyWy1hChangeOver10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetyWy1hChangeOver10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid,arg2);
}
}
@@ -1415,7 +1419,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, true, uuid,arg2);
}
}
@@ -1456,7 +1460,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, true, uuid,arg2);
}
}
@@ -1499,7 +1503,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, true, uuid,arg2);
}
}
@@ -1531,7 +1535,7 @@
if (alarmRuleDetailList.size() > 0) {
// 遍历
for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.videoOfflineHandleStation(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.videoOffline, false, adCode, true, uuid,arg2);
}
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
@@ -1567,7 +1571,7 @@
if (alarmRuleDetailList.size() > 0) {
// 遍历
for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
- if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
asyncNoticeHandle.topLevOfFloAlertHandleStation(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.topLevOfFloAlertList, true, adCode, true, uuid,arg2);
}
}
@@ -1891,4 +1895,23 @@
}
return result;
}
+
+ /**
+ * 是否在时间范围内发送
+ * @return
+ */
+ public 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