From c8b03d3da4e29fc3fb9a42ca157738256c331a00 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Mar 2024 13:55:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiUrlConstant.java |   86 +++++++++++++++++++++++++++++++++++++-----
 1 files changed, 75 insertions(+), 11 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiUrlConstant.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiUrlConstant.java
index 5cd26a5..123e305 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiUrlConstant.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiUrlConstant.java
@@ -18,48 +18,112 @@
 	public static final String url_prefix_prod = "http://10.42.6.192";
 
 	/**
+	 * 请求头url 前缀(prod)
+	 */
+	public static final String url_prefix_test = "http://10.42.6.192";
+
+	/**
 	 *  水位数据缺失
 	 */
 	public static final String res_z_null_api = "/services/1234567890ABCDEFGHIJKLMN/res/z_null";
 
 	/**
-	 * 水位数据缺失-全
+	 * 1.水位数据缺失-全
 	 */
 	public static final String no_z_last_api_all = "/services/1234567890ABCDEFGHIJKLMN/no_z_last/all";
 
 	/**
-	 *  水位数据异常
+	 *  2.水位数据异常
 	 */
 	public static final String res_z_not_normal_api = "/services/1234567890ABCDEFGHIJKLMN/res/z_not_normal";
 
 	/**
-	 *  水位超低于死水位
+	 *  3.水位超低于死水位
 	 */
 	public static final String res_diff_dead_z_api = "/services/1234567890ABCDEFGHIJKLMN/res/diff_dead_z";
 
 	/**
-	 *  水位初次超汛限告警
+	 *  5.水位接近汛限告警
+	 */
+	public static final String res_z_is_warn_over_flse_api = "/services/1234567890ABCDEFGHIJKLMN/res_z_is_warn/over_flse";
+
+	/**
+	 *  6.水位初次超汛限告警
 	 */
 	public static final String over_z_res_api = "/services/1234567890ABCDEFGHIJKLMN/over_z_res";
 
 	/**
-	 * 水位超设计洪水位告警处理
+	 *  7.水位小幅超汛限告警
+	 */
+	public static final String res_over_z_small_over_api = "/services/1234567890ABCDEFGHIJKLMN/res_over_z/small_over";
+
+	/**
+	 *  8.水位大幅超汛限告警
+	 */
+	public static final String res_over_z_big_over_api = "/services/1234567890ABCDEFGHIJKLMN/res_over_z/big_over";
+
+	/**
+	 *  9.水位接近设计洪水位告警
+	 */
+	public static final String res_over_des_is_warn_api = "/services/1234567890ABCDEFGHIJKLMN/res_over_des/is_warn";
+
+	/**
+	 * 10.水位超设计洪水位告警处理
 	 */
 	public static final String over_des_rz_warn_api = "/services/1234567890ABCDEFGHIJKLMN/over_des_rz/warn";
 
 	/**
-	 * 已降大雨告警
+	 * 11.水位超校核洪水位告警
 	 */
-	public static final String alam_rain_dy_api = "/services/1234567890ABCDEFGHIJKLMN/alarm/rain/dy/api";
+	public static final String res_over_chec_api = "/services/1234567890ABCDEFGHIJKLMN/res_over_chec";
 
 	/**
-	 * 已降暴雨告警
+	 * 12.近1h水位陡升
 	 */
-	public static final String alam_rain_by_api = "/services/1234567890ABCDEFGHIJKLMN/alarm/rain/by/api";
+	public static final String res_z_diff_up_api = "/services/1234567890ABCDEFGHIJKLMN/res_z_diff/up";
 
 	/**
-	 * 6小时降雨告警
+	 * 13.近1h水位陡降
 	 */
-	public static final String alam_rain_6_over_api = "/services/1234567890ABCDEFGHIJKLMN/alarm/rain/6/over/api";
+	public static final String res_z_diff_down_api = "/services/1234567890ABCDEFGHIJKLMN/res_z_diff/down";
+
+	/**
+	 * 15. 已降大雨告警
+	 */
+	public static final String alarm_rain_dy_api = "/services/1234567890ABCDEFGHIJKLMN/alarm/rain/dy/api";
+
+	/**
+	 * 16. 已降暴雨告警
+	 */
+	public static final String alarm_rain_by_api = "/services/1234567890ABCDEFGHIJKLMN/alarm/rain/by/api";
+
+	/**
+	 * 18. 6小时降雨告警
+	 */
+	public static final String alarm_rain_6_over_api = "/services/1234567890ABCDEFGHIJKLMN/alarm/rain/6/over/api";
+
+	/**
+	 * 19. 大坝安全监测告警-数据缺失(2024.03.12分开渗压、渗流、变形)
+	 */
+	public static final String alarm_db_api = "/services/1234567890ABCDEFGHIJKLMN/alarm/dt/sy/api";
+	/**
+	 * 20. 大坝安全监测告警-渗压管水位
+	 */
+	public static final String alarm_db_sy_api = "/services/1234567890ABCDEFGHIJKLMN/alarm/sy/api";
+
+	/**
+	 * 21. 大坝安全监测告警-渗压数据缺失
+	 */
+	public static final String alarm_db_sy_none_api = "/services/1234567890ABCDEFGHIJKLMN/alarm/dt/sy/api";
+
+	/**
+	 * 22. 大坝安全监测告警-渗流数据缺失
+	 */
+	public static final String alarm_db_sl_none_api = "/services/1234567890ABCDEFGHIJKLMN/alarm/dt/sl/api";
+
+	/**
+	 * 23. 大坝安全监测告警-位移数据缺失
+	 */
+	public static final String alarm_db_wy_none_api = "/services/1234567890ABCDEFGHIJKLMN/alarm/dt/wy/api";
 
 }

--
Gitblit v1.9.3