From 1b3180c31750f0a22840ec56df03d7fa59a57a4e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 11 Oct 2023 23:28:57 +0800
Subject: [PATCH] unipush 推送告警信息修改,告警内容读取修改

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 44beeff..2218e5e 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
@@ -282,9 +282,9 @@
 			// 超汛限水位
 			if (s.equals("over_z")) {
 				String is_danger_res = "is_danger_res";
-				if (jsonArray.getJSONObject(i).getString(is_danger_res).equals("true")) {
+				if (null!= jsonArray.getJSONObject(i).getString(is_danger_res) && 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")) {
+				} else if (null!= jsonArray.getJSONObject(i).getString(is_danger_res) && jsonArray.getJSONObject(i).getString(is_danger_res).equals("false")) {
 					format = format  + "汛限水位" + jsonArray.getJSONObject(i).getString(s);
 				} else {
 					format = format + jsonArray.getJSONObject(i).getString(s);

--
Gitblit v1.9.3