From 75432e263f73a89baed5dc4c4cccbe2ca7d6d446 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 03 三月 2025 10:05:54 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java
index eabf255..6f63306 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java
@@ -44,6 +44,18 @@
this.startUnits() ;
+ if(ServerProperties.argRtuAddr != null && !ServerProperties.argRtuAddr.trim().equals("")){
+ System.out.println("鍙傛暟RTU鍦板潃锛�" + ServerProperties.argRtuAddr) ;
+ ServerProperties.rtuAddr = ServerProperties.argRtuAddr ;
+ }else{
+ System.out.println("閰嶇疆RTU鍦板潃锛�" + ServerProperties.rtuAddr) ;
+ }
+
+ System.out.println("鍚姩涓�鍖呮锛�" + (ServerProperties.argOneDie==null?"鍚�":(ServerProperties.argOneDie?"鏄�":"鍚�"))) ;
+ System.out.println("鍚姩澶氬寘姝伙細" + (ServerProperties.argMultiDie==null?"鍚�":(ServerProperties.argMultiDie?"鏄�":"鍚�"))) ;
+
+
+
String svName ;
try{
svName = this.conf.getSetAttrTxt(this.doc, "config.server", "name", null, false, null) ;
@@ -72,7 +84,7 @@
System.out.println("@@@@@@$ O@@@@@@@@@ &@@@@@@@@") ;
}
System.out.println("@@@@@@$ #@@@@@@@@@$ &@@@@@@@@ 鏈琑TU妯℃嫙鍦板潃 " + ServerProperties.rtuAddr ) ;
- System.out.println("@@@@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ Runing in standalone mode" ) ;
+ System.out.println("@@@@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ Running in standalone mode" ) ;
System.out.println("@@@@@@@@@@@@@@@@@@@@@& &@@@@@@@@ Startup in " + (System.currentTimeMillis() - start) + " MS" ) ;
System.out.println("@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ " + company) ;
System.out.println("@@@@@@@@@@@@@@@@#O &@@@@@@@@") ;
@@ -93,8 +105,16 @@
// ///////////////
// TCP 妯″潡
TcpClUnitConfigVo tcpVo = new TcpClUnitConfigVo();
- tcpVo.mwServerIp = conf.getSetAttrTxt(doc, "config.tcpCl", "mwServerIp", null, false, null);
- tcpVo.mwServerPort = conf.getSetAttrPlusInt(doc, "config.tcpCl", "mwServerPort", null, 100, 65535, null);
+ if(ServerProperties.serverIp != null && !ServerProperties.serverIp.trim().equals("")){
+ tcpVo.mwServerIp = ServerProperties.serverIp ;
+ }else{
+ tcpVo.mwServerIp = conf.getSetAttrTxt(doc, "config.tcpCl", "mwServerIp", null, false, null);
+ }
+ if(ServerProperties.serverPort != null){
+ tcpVo.mwServerPort = ServerProperties.serverPort ;
+ }else{
+ tcpVo.mwServerPort = conf.getSetAttrPlusInt(doc, "config.tcpCl", "mwServerPort", null, 100, 65535, null);
+ }
tcpVo.connectTimeout = conf.getSetAttrPlusInt(doc, "config.tcpCl", "connectTimeout", null, 1000, 10000, null);
this.mwServerUrl = tcpVo.mwServerIp + ":" + tcpVo.mwServerPort ;
AdapterImp_TcpClUnit tcpAdap = new AdapterImp_TcpClUnit();
--
Gitblit v1.8.0