From c9f39a721e2e0320012d0b15a931f33160ac51ae Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 09:01:31 +0800
Subject: [PATCH] 命令日志查询增加一个state属性，并优化SQL
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java
index b22b435..ec68ff5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java
@@ -26,7 +26,6 @@
import org.springframework.web.util.UriComponentsBuilder;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -77,17 +76,17 @@
JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
if(response != null && response.getString("code").equals("0001")) {
- JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
+ JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
JSONArray jsonArray = new JSONArray();
if(attachment != null) {
- HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class);
- for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) {
+ attachment.forEach((key, value) -> {
JSONObject jsonObject = new JSONObject();
- jsonObject.put("rtuAddr", entry.getKey());
- jsonObject.put("isOnLine", entry.getValue());
+ jsonObject.put("rtuAddr", key);
+ jsonObject.put("isOnLine", value);
jsonArray.add(jsonObject);
- }
+
+ });
}
qo.setOnLineMap(jsonArray.toJSONString());
@@ -117,17 +116,17 @@
JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
if(response != null && response.getString("code").equals("0001")) {
- JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
+ JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
JSONArray jsonArray = new JSONArray();
if(attachment != null) {
- HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class);
- for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) {
+ attachment.forEach((key, value) -> {
JSONObject jsonObject = new JSONObject();
- jsonObject.put("rtuAddr", entry.getKey());
- jsonObject.put("isOnLine", entry.getValue());
+ jsonObject.put("rtuAddr", key);
+ jsonObject.put("isOnLine", value);
jsonArray.add(jsonObject);
- }
+
+ });
}
qo.setOnLineMap(jsonArray.toJSONString());
--
Gitblit v1.8.0