Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2024-10-28 927beadbb05d22759efc4d60c931f906bffa511d

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java

@@ -30,7 +30,6 @@
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -123,17 +122,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);
                }

                });
            }

            System.out.println(jsonArray);
@@ -191,15 +190,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");
            HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class);
            JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");

            JSONArray jsonArray = new JSONArray();
            for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) {
            if(attachment != null) {
                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);

                });
            }
            System.out.println(jsonArray);
            return rmCommandHistoryMapper.getUncloseParam(jsonArray.toJSONString(), intakeId);