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

liurunyu

2024-10-31 9308557e9616507c6046fadeab6e754af81a8fa2

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