From 8018e564729067b0b61a5c992b5667dbcad39c70 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Fri, 13 Sep 2024 23:12:15 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 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 b46b56f..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
@@ -68,6 +68,14 @@
}};
/**
+ * 6.1水位初次超汛限告警-合并水库
+ */
+ public static List<String> waterFirstOverMergeWaterList = new ArrayList<String>()
+ {{
+ add("town_nm,res_nm,1");
+ }};
+
+ /**
* 7.水位小幅超汛限告警
*/
public static List<String> waterSmallScaleOverList = new ArrayList<String>()
@@ -78,6 +86,14 @@
add("over_1h");
add("over_z");
add("flse_lim_stag");
+ }};
+
+ /**
+ * 7.1水位小幅超汛限告警-合并
+ */
+ public static List<String> waterSmallScaleOverMergeList = new ArrayList<String>()
+ {{
+ add("town_nm,res_nm,1");
}};
/**
@@ -161,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>()
@@ -171,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");
}};
/**
@@ -186,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>()
@@ -195,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");
}};
/**
@@ -209,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>()
@@ -220,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>()
@@ -230,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