From 73bdaa12e30499dd0d9f4da743099e91d7688d35 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 23 Jul 2024 14:16:40 +0800
Subject: [PATCH] 预警规则短信在指定时间发送

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java |   57 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 40 insertions(+), 17 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 25bfd21..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
@@ -64,6 +64,9 @@
 				list.add(alarmRecord.getId().toString());
 			}
 		}
+
+		if (!isTimeSend()) return;
+
 		// 调用短信服务
 		smsService.sendMergeSignMsg(smsRequestTemplate);
 	}
@@ -114,6 +117,8 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+
+			if (!isTimeSend()) return map;
 			// 调用短信服务
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			// 返回
@@ -218,6 +223,9 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+
+			if (!isTimeSend()) return map;
+
 			// 调用短信服务
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			return map;
@@ -272,6 +280,7 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+			if (!isTimeSend()) return map;
 			// 调用短信服务
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			return map;
@@ -325,6 +334,7 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+			if (!isTimeSend()) return map;
 			// 调用短信服务
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			return map;
@@ -378,6 +388,7 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+			if (!isTimeSend()) return map;
 			// 调用短信服务
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			return map;
@@ -429,6 +440,7 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+			if (!isTimeSend()) return map;
 			// 调用短信服务
 //			map = smsService.sendSignMsg(smsRequestTemplate);
 			return map;
@@ -475,6 +487,7 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+			if (!isTimeSend()) return map;
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			// 调用短信服务
 			return map;
@@ -623,6 +636,7 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+			if (!isTimeSend()) return map;
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			// 调用短信服务
 			return map;
@@ -667,6 +681,7 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+			if (!isTimeSend()) return map;
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			// 调用短信服务
 			return map;
@@ -719,6 +734,7 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+			if (!isTimeSend()) return map;
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			// 调用短信服务
 			return map;
@@ -762,6 +778,7 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+			if (!isTimeSend()) return map;
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			// 调用短信服务
 			return map;
@@ -814,6 +831,7 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+			if (!isTimeSend()) return map;
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			// 调用短信服务
 			return map;
@@ -865,6 +883,7 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+			if (!isTimeSend()) return map;
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			// 调用短信服务
 			return map;
@@ -913,6 +932,7 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+			if (!isTimeSend()) return map;
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			// 调用短信服务
 			return map;
@@ -962,6 +982,7 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+			if (!isTimeSend()) return map;
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			// 调用短信服务
 			return map;
@@ -1014,6 +1035,7 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+			if (!isTimeSend()) return map;
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			// 调用短信服务
 			return map;
@@ -1057,6 +1079,7 @@
 					list.add(alarmRecord.getId().toString());
 				}
 			}
+			if (!isTimeSend()) return map;
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			// 调用短信服务
 			return map;
@@ -1177,7 +1200,7 @@
 				}
 			}
 			//如果参数是day，表示是每天生成告警，不需要发信息
-			if (isDay.equals("day")) return map;
+			if (isDay.equals("day") || !isTimeSend()) return map;
 			map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
 			// 调用短信服务
 			return map;
@@ -1203,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;
@@ -1243,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;
@@ -1319,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;
@@ -1389,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;
@@ -1463,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;
@@ -1535,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;
@@ -1620,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;
@@ -1719,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;
@@ -1810,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;
@@ -1893,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;
@@ -1978,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;
@@ -2070,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;
@@ -2157,7 +2180,7 @@
 
 
 			//如果参数是day，表示是每天生成告警，不需要发信息
-			if (isDay.equals("day")) return map;
+			if (isDay.equals("day") || !isTimeSend()) return map;
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			// 调用短信服务
 			return map;
@@ -2236,7 +2259,7 @@
 
 
 			//如果参数是day，表示是每天生成告警，不需要发信息
-			if (isDay.equals("day")) return map;
+			if (isDay.equals("day") || !isTimeSend()) return map;
 			map = smsService.sendSignMsg(smsRequestTemplate);
 			// 调用短信服务
 			return map;
@@ -2368,7 +2391,7 @@
 		}
 
 		//如果参数是day，表示是每天生成告警，不需要发信息
-		if (isDay.equals("day")) return;
+		if (isDay.equals("day") || !isTimeSend()) return;
 		// 调用短信服务
 		smsService.sendMergeSignMsg(smsRequestTemplate);
 	}
@@ -2396,7 +2419,7 @@
 				}
 			}
 			//如果参数是day，表示是每天生成告警，不需要发信息
-			if (isDay.equals("day")) return map;
+			if (isDay.equals("day") || !isTimeSend()) return map;
 			map = smsService.sendSignMsgMergeCdVideo(smsRequestTemplate);
 			// 调用短信服务
 			return map;

--
Gitblit v1.9.3