From 4473911c8f1040b72fa91bfe62c7dc247376f9ff Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 23 Jul 2024 14:08:45 +0800
Subject: [PATCH] 预警规则修改成预警记录生成，站内信在指定时间生效
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java | 64 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 19 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..25bfd21 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;
@@ -165,6 +166,8 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if(!isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -518,6 +521,8 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if(!isTimeSend()) return map;
List<String> list = noticeHandle.createOutCallTaskByAlarm(smsRequestTemplate);
map.put("list", list);
// 调用短信服务
@@ -564,6 +569,8 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if (!isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1093,7 +1100,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1122,7 +1129,7 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
@@ -1146,7 +1153,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 需要合并水库保存站内信记录信息
noticeHandle.saveInStationInfoMerge(smsRequestTemplate, alarmRule);
}
@@ -1274,7 +1281,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1349,7 +1356,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1422,7 +1429,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1494,7 +1501,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1568,7 +1575,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1674,7 +1681,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1765,7 +1772,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1848,7 +1855,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1933,7 +1940,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2017,7 +2024,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2109,7 +2116,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2189,7 +2196,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2275,7 +2282,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2307,7 +2314,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfoMergeNoCd(smsRequestTemplate, alarmRule);
}
@@ -2341,7 +2348,7 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfoMergeVideo(smsRequestTemplate, alarmRule);
}
@@ -2442,9 +2449,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