pipIrr-mwTest-client阶段提交

liurunyu

2023-11-29 f2df44d7b3865cafe86baa48e19d1df0c0723702

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

@@ -94,13 +94,30 @@
   }
   
   //把数据上报完成情况  上报给mwTestServer
   public void reportHadReportOver(Long seconds){
   public void reportHadReportOver(Integer count){
      try {
         Thread.sleep(100L);
         RmiRequestVo rqVo = new RmiRequestVo() ;
         rqVo.id = id ;
         rqVo.token = token ;
         rqVo.code = Code.cd5 ;
         rqVo.count = count ;
         String json = rqVo.toJson() ;
         frmWork.syncRequest(json) ;
      } catch (Exception e) {
         log.error("把数据上报完成情况  上报给mwTestServer失败" + e.getMessage());
      }
   }


   //把数据上报完成情况  上报给mwTestServer
   public void allOver(Long seconds){
      try {
         Thread.sleep(100L);
         RmiRequestVo rqVo = new RmiRequestVo() ;
         rqVo.id = id ;
         rqVo.token = token ;
         rqVo.code = Code.cd6 ;
         rqVo.over = true ;
         rqVo.seconds = seconds ;
         String json = rqVo.toJson() ;
@@ -178,15 +195,19 @@
                        if(rVo != null){
                           ServerProperties.rtuAddrStart = rVo.rtuAddrStart;
                           ServerProperties.rtuAddrEnd = rVo.rtuAddrEnd;
                           ServerProperties.serverIp = rVo.serverIp;
                           ServerProperties.serverPort = rVo.serverPort;
                           ServerProperties.tcpServerIp = rVo.tcpServerIp;
                           ServerProperties.tcpServerPort = rVo.tcpServerPort;
                           ServerProperties.sendInterval = rVo.sendInterval ;
                           ServerProperties.heartbeatTimes = rVo.heartbeatTimes ;
                           ServerProperties.sendTimes = rVo.sendTimes ;
                           log.info("得到配置成功");
                           log.info("    开始RtuAddr=" + ServerProperties.rtuAddrStart);
                           log.info("    截止RtuAddr=" + ServerProperties.rtuAddrEnd);
                           log.info("    mwAccept服务IP=" + ServerProperties.serverIp);
                           log.info("    mwAccept服务端口=" + ServerProperties.serverPort);
                           log.info("    每imei上报数据次数=" + ServerProperties.sendTimes);
                           log.info("    mwAccept服务IP=" + ServerProperties.tcpServerIp);
                           log.info("    mwAccept服务端口=" + ServerProperties.tcpServerPort);
                           log.info("    发送数据间隔=" + ServerProperties.sendTimes);
                           log.info("    每轮次发送心跳次数=" + ServerProperties.heartbeatTimes);
                           log.info("    每RTU上报数据轮次=" + ServerProperties.sendTimes);
                           break ;
                        }else{
                           log.error("rmi得到配置失败：json转ResConfigVo为null");