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/service/impl/NoticeHandle.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 e15c379..b47f33c 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
@@ -31,6 +31,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -189,6 +190,9 @@
set.add(tempStr);
// 取出测站编码
String stcd = jsonArray.getJSONObject(i).getString("stcd");
+ if (StringUtil.isBlank(stcd)) {
+ stcd = jsonArray.getJSONObject(i).getString("cd");
+ }
// 判断时间是否存在
String tm = jsonArray.getJSONObject(i).getString("tm");
String day = "";
@@ -282,9 +286,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);
@@ -318,6 +322,20 @@
format = format + "已漫过坝顶" + (-parseDouble);
}
}else {
+ format = format + jsonArray.getJSONObject(i).getString(s);
+ }
+ } else if (s.equals("ms_flag")) {
+ // 水位
+ String ms_flag = "ms_flag";
+ if (null!= jsonArray.getJSONObject(i).getString(ms_flag) && jsonArray.getJSONObject(i).getString(ms_flag).equals("sy")) {
+ format = format + "渗压";
+ } else if (null!= jsonArray.getJSONObject(i).getString(ms_flag) && jsonArray.getJSONObject(i).getString(ms_flag).equals("sl")) {
+ format = format + "渗流" ;
+ } else if (null!= jsonArray.getJSONObject(i).getString(ms_flag) && jsonArray.getJSONObject(i).getString(ms_flag).equals("by")) {
+ format = format + "白蚁" ;
+ } else if (null!= jsonArray.getJSONObject(i).getString(ms_flag) && jsonArray.getJSONObject(i).getString(ms_flag).equals("bx")) {
+ format = format + "变形" ;
+ } else {
format = format + jsonArray.getJSONObject(i).getString(s);
}
} else {
@@ -514,6 +532,9 @@
if (activeProfile.equals("prod")){
url = ZtApiUrlConstant.url_prefix_prod + url;
}
+ if (activeProfile.equals("test")){
+ url = ZtApiUrlConstant.url_prefix_test + url;
+ }
//设置请求头
HttpHeaders headers = new HttpHeaders();
headers.add(ZtConfigConstant.header_key, ZtConfigConstant.header_value);
@@ -620,7 +641,7 @@
// addSendMsgTest(messageRecordList1);
//给app推送消息
// pushService.pushMessageList(messageRecordList1);
-// pushService.pushMessageList(messageRecordList);
+ pushService.pushMessageList(messageRecordList);
// 保存记录
messageClient.saveMessageRecord(messageRecordList);
--
Gitblit v1.9.3