From a8cdd1843f64f2630efa273efbddd438e058ebb1 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 27 Jun 2024 14:19:42 +0800
Subject: [PATCH] 降雨告警新增雨量站信息写入,接口查询变更,短信记录新增告警规则绑定

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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 6668d82..cd51d7c 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
@@ -37,6 +37,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.util.Strings;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
@@ -203,6 +204,9 @@
 		if (!set.contains(tempStr)) {
 			set.add(tempStr);
 			String stcd = jsonArray.getJSONObject(i).getString("stcd");
+			if (StringUtil.isBlank(stcd)) {
+				stcd = jsonArray.getJSONObject(i).getString("rain_stcd");
+			}
 			if (StringUtil.isBlank(stcd)) {
 				stcd = jsonArray.getJSONObject(i).getString("cd");
 			}
@@ -923,6 +927,13 @@
 		return null;
 	}
 
+	public Map<String, String> jsonObjectToMap(JSONObject jsonObject) {
+		Map<String, String> map = new HashMap<>();
+		for (String key : jsonObject.keySet()) {
+			map.put(key, jsonObject.get(key).toString());
+		}
+		return map;
+	}
 
 	/**
 	 * 调用中台接口查询数据,返回结果不同处理

--
Gitblit v1.9.3