From 9733ac7f94f6de6b925ae5e709c0c68171ffb93e Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Fri, 26 Jul 2024 15:50:06 +0800
Subject: [PATCH] 初次超汛告警及小幅告警调整

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 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 95915dd..b5e0239 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
@@ -197,15 +197,15 @@
 
 
 	/**
-	 * 策略6: 水位初次超汛限告警(当前测试发送站内信)
+	 * 策略6: 水位初次超汛限告警
 	 *
 	 * @param arg1
 	 * @param arg2
 	 * @return
 	 */
 	public String waterFirstOverHandle(String arg1, String arg2) {
-		String adCode = "421303000000";
-//		String adCode = null;
+//		String adCode = "421303000000";
+		String adCode = null;
 		// 查询当前策略对应的告警规则信息
 		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
 		// 调用中台服务接口查询数据
@@ -242,7 +242,7 @@
 		// 查询当前策略对应的告警规则信息
 		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
 		// 调用中台服务接口查询数据
-		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_over_z_small_over_api);
+		JSONArray ztData = noticeHandle.getZtData("?diff_value=0", ZtApiUrlConstant.res_over_z_small_over_api);
 		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
 		if (null != alarmRule) {
 			// 查询告警详情信息
@@ -252,9 +252,10 @@
 				if (alarmRuleDetailList.get(0).getAlarmMode().equals("短信")) {
 					asyncNoticeHandle.waterSmallScaleOverHandle1(alarmRule, alarmRuleDetailList.get(0), ztData, ZtApiDataColumnConstant.waterSmallScaleOverList, true, adCode, false, uuid);
 				}
-				if (alarmRuleDetailList.get(1).getAlarmMode().equals("短信")) {
-					asyncNoticeHandle.waterSmallScaleOverHandle2(alarmRule, alarmRuleDetailList.get(1), ztData, ZtApiDataColumnConstant.waterSmallScaleOverList, true, adCode, false, uuid);
-				}
+				// 待合并调整好后发
+//				if (alarmRuleDetailList.get(1).getAlarmMode().equals("短信")) {
+//					asyncNoticeHandle.waterSmallScaleOverHandle2(alarmRule, alarmRuleDetailList.get(1), ztData, ZtApiDataColumnConstant.waterSmallScaleOverList, true, adCode, false, uuid);
+//				}
 			}
 		}
 		// 返回

--
Gitblit v1.9.3