From d6e5d8b88c2cea6e05e249105e585cad9f6082dd Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Mon, 02 Sep 2024 15:34:30 +0800
Subject: [PATCH] 水雨情告警合并发送内容调整

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java |   65 ++++++++++++++++++++++++++++++++
 1 files changed, 65 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java
index 0551b19..c156e14 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java
@@ -89,6 +89,14 @@
 	}};
 
 	/**
+	 * 7.1水位小幅超汛限告警-合并
+	 */
+	public static List<String>  waterSmallScaleOverMergeList = new ArrayList<String>()
+	{{
+		add("town_nm,res_nm,1");
+	}};
+
+	/**
 	 * 8.1水位大幅超汛限告警1
 	 */
 	public static List<String>  waterBigScaleOverList1 = new ArrayList<String>()
@@ -169,6 +177,14 @@
 	}};
 
 	/**
+	 * 10.1 水位超设计洪水位告警处理-合并
+	 */
+	public static List<String>  waterMoreDesignMergeList = new ArrayList<String>()
+	{{
+		add("town_nm,res_nm,1");
+	}};
+
+	/**
 	 * 11 水位超校核洪水位告警
 	 */
 	public static List<String>  waterMoreCheckList = new ArrayList<String>()
@@ -179,6 +195,14 @@
 		add("over_chec_fl_stag");
 		add("diff_dam");
 		add("drp_24");
+	}};
+
+	/**
+	 * 11.1 水位超校核洪水位告警-合并
+	 */
+	public static List<String>  waterMoreCheckMergeList = new ArrayList<String>()
+	{{
+		add("town_nm,res_nm,1");
 	}};
 
 	/**
@@ -194,6 +218,14 @@
 	}};
 
 	/**
+	 * 12.1 近1h水位陡升-合并
+	 */
+	public static List<String>  waterComeOneHourUpMergeList = new ArrayList<String>()
+	{{
+		add("town_nm,res_nm,1");
+	}};
+
+	/**
 	 * 13 近1h水位陡降
 	 */
 	public static List<String>  waterComeOneHourDownList = new ArrayList<String>()
@@ -203,6 +235,14 @@
 		add("rz");
 		add("over_1h");
 		add("drp_24");
+	}};
+
+	/**
+	 * 13.1 近1h水位陡降-合并
+	 */
+	public static List<String>  waterComeOneHourDownMergeList = new ArrayList<String>()
+	{{
+		add("town_nm,res_nm,1");
 	}};
 
 	/**
@@ -217,6 +257,14 @@
 	}};
 
 	/**
+	 * 15.1 已降大雨告警-合并
+	 */
+	public static List<String>  alreadyHeavyRainMergeList = new ArrayList<String>()
+	{{
+		add("town_nm,res_nm,1");
+	}};
+
+	/**
 	 * 16 已降暴雨告警
 	 */
 	public static List<String> alreadyRainstormList = new ArrayList<String>()
@@ -228,6 +276,14 @@
 	}};
 
 	/**
+	 * 16.1 已降暴雨告警合并
+	 */
+	public static List<String> alreadyRainstormMergeList = new ArrayList<String>()
+	{{
+		add("town_nm,res_nm,1");
+	}};
+
+	/**
 	 * 18 6小时降雨告警
 	 */
 	public static List<String> sixHourRainList = new ArrayList<String>()
@@ -238,6 +294,15 @@
 		add("rz");
 	}};
 
+
+	/**
+	 * 18.1 6小时降雨告警-合并
+	 */
+	public static List<String> sixHourRainMergeList = new ArrayList<String>()
+	{{
+		add("county_nm,town_nm,res_nm,1");
+	}};
+
 	/**
 	 * 19.坝安全监测告警-数据缺失
 	 */

--
Gitblit v1.9.3