From 3b668f811fce818ce69ac9bca4195976704dc719 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 18 十二月 2023 15:35:59 +0800
Subject: [PATCH] 1、优化ID生成器，方法同步锁改为静态变量同步锁； 2、RTU模拟器中增加TCP连接输出日志信息； 3、RTU模拟器中增加Rmi相关输出日志信息；
---
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/RmiClUnit.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 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..e383670 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
@@ -73,6 +73,8 @@
}
public RmiFrameWork getRmiFrameWork(){
+ System.setProperty("java.rmi.server.hostname", confVo.svUrl) ;
+ System.out.println("Rmi寤虹珛杩炴帴璇锋眰鏈嶅姟绔細" + confVo.svUrl + ":" + confVo.svPort + "/" + confVo.svContext);
RmiClient rmiCl = new RmiClient(confVo.svUrl, confVo.svPort, confVo.svContext) ;
return rmiCl.getRmiInterface() ;
}
@@ -94,13 +96,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.overCount = 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 +197,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