From a0cead06018799c013305ccfcc2f4b95a564af45 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 10 Jul 2023 10:07:26 +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 | 18 ++++++++++++++----
1 files changed, 14 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 991b723..5eff055 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
@@ -18,7 +18,6 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -28,8 +27,7 @@
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
@Component
public class NoticeHandle {
@@ -49,6 +47,7 @@
@Autowired
private RestTemplate restTemplate;
+
/**
@@ -196,7 +195,18 @@
String[] split = column.split(",");
String format = "";
for (String s : split) {
- format = format + jsonArray.getJSONObject(i).getString(s);
+ 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 {
+ format = format + jsonArray.getJSONObject(i).getString(s);
+ }
+ }else {
+ format = format + jsonArray.getJSONObject(i).getString(s);
+ }
}
list.add(format);
}
--
Gitblit v1.9.3