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

liurunyu

2024-11-14 a700bf4e6423e3ad9cbf5119eb46defad84c76b3

 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java

@@ -100,7 +100,6 @@
        com.code = "LCD0001";
        com.type = "innerCommand";
        comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);

        JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));

        JSONArray jsonArray = new JSONArray();
@@ -114,7 +113,7 @@
                    jsonArray.add(jsonObject);
                });
            }
            System.out.println(jsonArray.toJSONString());
            //System.out.println(jsonArray.toJSONString());
        }

        /**
@@ -127,7 +126,7 @@
            for (int i = 0; i < rtus.size(); i++) {
                Long comId = rmCommandHistoryMapper.getLastComId(rtus.get(i).getRtuAddr(), rtus.get(i).getVcNum());
                if(comId > 0) {
                    comIds = comIds + comId + ",";
                    comIds = comIds + "\"" + comId + "\",";
                }
            }
        }