From 6735eaad855055d7a7e1149f3a01ebff1e29005b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 26 Jul 2023 16:00:43 +0800
Subject: [PATCH] 雨量大雨，暴雨，6小时告警新增
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
index 6323298..979641d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
@@ -78,7 +78,7 @@
* @param alarmRule
* @param columnsList 列名集合信息
* @param flag 是否包含日期
- * @param adCode 行政区编号
+ * @param adCode 行政区编号(是否过滤区县数据)
* @param uuid 本次执行临时编号
* @return
*/
@@ -234,16 +234,33 @@
String[] split = column.split(",");
String format = "";
for (String s : split) {
+ // 超汛限水位
if (s.equals("over_z")) {
String is_danger_res = "is_danger_res";
if (jsonArray.getJSONObject(i).getString(is_danger_res).equals("true")) {
format = format + "超过控制运用水位" + jsonArray.getJSONObject(i).getString(s);
- }else if (jsonArray.getJSONObject(i).getString(is_danger_res).equals("false")){
- format = format + "超过汛限水位" + jsonArray.getJSONObject(i).getString(s);
+ } else if (jsonArray.getJSONObject(i).getString(is_danger_res).equals("false")) {
+ format = format + "超过汛限水位" + jsonArray.getJSONObject(i).getString(s);
+ } else {
+ format = format + jsonArray.getJSONObject(i).getString(s);
+ }
+ } else if (s.equals("rz")) {
+ // 水位
+ String rz = "rz";
+ if (null==jsonArray.getJSONObject(i).getString(rz)) {
+ format = format + "无数据";
+ } else {
+ format = format + jsonArray.getJSONObject(i).getString(s) + "米";
+ }
+ } else if (s.equals("alarm_val")) {
+ // 小时雨量
+ String alarm_type = "alarm_type";
+ if (null!=jsonArray.getJSONObject(i).getString(alarm_type) && !jsonArray.getJSONObject(i).getString(alarm_type).equals("")) {
+ format = format + jsonArray.getJSONObject(i).getString(alarm_type) + "小时坝前点雨量" + jsonArray.getJSONObject(i).getString(s);
}else {
format = format + jsonArray.getJSONObject(i).getString(s);
}
- }else {
+ } else {
format = format + jsonArray.getJSONObject(i).getString(s);
}
}
--
Gitblit v1.9.3