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/ZtApiDataColumnConstant.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 304e579..65a9cea 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
@@ -16,7 +16,7 @@
*/
public static List<String> waterInfoNotList = new ArrayList<String>()
{{
- add("county_nm,town_nm");
+// add("county_nm,town_nm");
add("res_nm");
}};
@@ -25,7 +25,7 @@
*/
public static List<String> waterDataExcList = new ArrayList<String>()
{{
- add("county_nm,town_nm");
+// add("county_nm,town_nm");
add("res_nm");
// add("rz");
}};
@@ -223,4 +223,24 @@
add("rz");
}};
+ /**
+ * 19.坝安全监测告警-数据缺失
+ */
+ public static List<String> damSafetyList = new ArrayList<String>()
+ {{
+// add("county_nm,town_nm");
+ add("res_nm");
+ add("ms_flag");
+ }};
+
+ /**
+ * 20.坝安全监测告警-渗压管水位大于校核洪水位
+ */
+ public static List<String> damSafetySyList = new ArrayList<String>()
+ {{
+ add("city_nm,county_nm,town_nm");
+ add("res_nm");
+ add("sy_val");
+ add("tb_chec_fl_stag");
+ }};
}
--
Gitblit v1.9.3