From f2df44d7b3865cafe86baa48e19d1df0c0723702 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 29 十一月 2023 19:46:46 +0800
Subject: [PATCH] pipIrr-mwTest-client阶段提交

---
 pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/RmiClUnit.java |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/RmiClUnit.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/RmiClUnit.java
index 8d30bb8..008ed2a 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/RmiClUnit.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/RmiClUnit.java
@@ -94,13 +94,30 @@
 	}
 	
 	//鎶婃暟鎹笂鎶ュ畬鎴愭儏鍐�  涓婃姤缁檓wTestServer
-	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("鎶婃暟鎹笂鎶ュ畬鎴愭儏鍐�  涓婃姤缁檓wTestServer澶辫触" + e.getMessage());
+		}
+	}
+
+
+	//鎶婃暟鎹笂鎶ュ畬鎴愭儏鍐�  涓婃姤缁檓wTestServer
+	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("    寮�濮婻tuAddr=" + ServerProperties.rtuAddrStart);
 									log.info("    鎴RtuAddr=" + ServerProperties.rtuAddrEnd);
-									log.info("    mwAccept鏈嶅姟IP=" + ServerProperties.serverIp);
-									log.info("    mwAccept鏈嶅姟绔彛=" + ServerProperties.serverPort);
-									log.info("    姣廼mei涓婃姤鏁版嵁娆℃暟=" + ServerProperties.sendTimes);
+									log.info("    mwAccept鏈嶅姟IP=" + ServerProperties.tcpServerIp);
+									log.info("    mwAccept鏈嶅姟绔彛=" + ServerProperties.tcpServerPort);
+									log.info("    鍙戦�佹暟鎹棿闅�=" + ServerProperties.sendTimes);
+									log.info("    姣忚疆娆″彂閫佸績璺虫鏁�=" + ServerProperties.heartbeatTimes);
+									log.info("    姣廟TU涓婃姤鏁版嵁杞=" + ServerProperties.sendTimes);
 									break ;
 								}else{
 									log.error("rmi寰楀埌閰嶇疆澶辫触锛歫son杞琑esConfigVo涓簄ull");

--
Gitblit v1.8.0