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

Administrator

2024-07-18 66160634b3f6ee11af600cc17ef477aed657d28e

 pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/RmiClUnit.java

@@ -202,6 +202,7 @@
                           ServerProperties.sendInterval = rVo.sendInterval ;
                           ServerProperties.heartbeatTimes = rVo.heartbeatTimes ;
                           ServerProperties.sendTimes = rVo.sendTimes ;
                           ServerProperties.sendOverThenCloseConnect = rVo.sendOverThenCloseConnect ;
                           log.info("得到配置成功");
                           log.info("    开始RtuAddr=" + ServerProperties.rtuAddrStart);
                           log.info("    截止RtuAddr=" + ServerProperties.rtuAddrEnd);
@@ -210,6 +211,7 @@
                           log.info("    发送数据间隔=" + ServerProperties.sendTimes);
                           log.info("    每轮次发送心跳次数=" + ServerProperties.heartbeatTimes);
                           log.info("    每RTU上报数据轮次=" + ServerProperties.sendTimes);
                           log.info("    发送完数据后，是否关闭TCP连接(1是，0否)=" + ServerProperties.sendOverThenCloseConnect);
                           break ;
                        }else{
                           log.error("rmi得到配置失败：json转ResConfigVo为null");