pipIrr-SV.git - Gitblit

parent: fe1e6552 | 补丁 | 提交 | ignore whitespace

2024-10-28 删除被注释掉的代码

zhubaomin

2024-10-28 a682e8493483d0e07415d1928e0dd8ba28d180c2

2024-10-28 删除被注释掉的代码

5个文件已修改

	pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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);

 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);

 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);

 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);

 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);

			@@ -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);

			@@ -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);

			@@ -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);

			@@ -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);

			@@ -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);