From a682e8493483d0e07415d1928e0dd8ba28d180c2 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 20:44:16 +0800
Subject: [PATCH] 2024-10-28 删除被注释掉的代码

---
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java |    8 --------
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java         |    8 --------
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java         |    8 --------
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java          |   16 ----------------
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java           |   16 ----------------
 5 files changed, 0 insertions(+), 56 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
index d741f10..9dd4755 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
@@ -81,18 +81,10 @@
 
         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()) {
-                //    JSONObject jsonObject = new JSONObject();
-                //    jsonObject.put("rtuAddr", entry.getKey());
-                //    jsonObject.put("isOnLine", entry.getValue());
-                //    jsonArray.add(jsonObject);
-                //}
                 attachment.forEach((key, value) -> {
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("rtuAddr", key);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
index d36d3ce..e5c9295 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -273,18 +273,10 @@
         com.type = "innerCommand";
         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()) {
-                //    JSONObject jsonObject = new JSONObject();
-                //    jsonObject.put("rtuAddr", entry.getKey());
-                //    jsonObject.put("isOnLine", entry.getValue());
-                //    jsonArray.add(jsonObject);
-                //}
                 attachment.forEach((key, value) -> {
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("rtuAddr", key);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
index dd734a3..da9d08a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
@@ -122,18 +122,10 @@
 
         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()) {
-                //    JSONObject jsonObject = new JSONObject();
-                //    jsonObject.put("rtuAddr", entry.getKey());
-                //    jsonObject.put("isOnLine", entry.getValue());
-                //    jsonArray.add(jsonObject);
-                //}
                 attachment.forEach((key, value) -> {
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("rtuAddr", key);
@@ -198,18 +190,10 @@
 
         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()) {
-                //    JSONObject jsonObject = new JSONObject();
-                //    jsonObject.put("rtuAddr", entry.getKey());
-                //    jsonObject.put("isOnLine", entry.getValue());
-                //    jsonArray.add(jsonObject);
-                //}
                 attachment.forEach((key, value) -> {
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("rtuAddr", key);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
index 146b1c4..218b9ef 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
@@ -103,18 +103,10 @@
 
         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()) {
-                //    JSONObject jsonObject = new JSONObject();
-                //    jsonObject.put("rtuAddr", entry.getKey());
-                //    jsonObject.put("isOnLine", entry.getValue());
-                //    jsonArray.add(jsonObject);
-                //}
                 attachment.forEach((key, value) -> {
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("rtuAddr", key);
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 bf1091b..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
@@ -76,18 +76,10 @@
 
         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()) {
-                //    JSONObject jsonObject = new JSONObject();
-                //    jsonObject.put("rtuAddr", entry.getKey());
-                //    jsonObject.put("isOnLine", entry.getValue());
-                //    jsonArray.add(jsonObject);
-                //}
                 attachment.forEach((key, value) -> {
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("rtuAddr", key);
@@ -124,18 +116,10 @@
 
         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()) {
-                //    JSONObject jsonObject = new JSONObject();
-                //    jsonObject.put("rtuAddr", entry.getKey());
-                //    jsonObject.put("isOnLine", entry.getValue());
-                //    jsonArray.add(jsonObject);
-                //}
                 attachment.forEach((key, value) -> {
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("rtuAddr", key);

--
Gitblit v1.8.0