From fbc250276c78ca2afa45a55e8af8deddd65e4f8a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 16 十二月 2024 11:23:41 +0800
Subject: [PATCH] 临时任务功能,修改bug
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 b651a13..789a053 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
@@ -54,6 +54,8 @@
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) ;
@@ -103,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