From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 cf730e4..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
@@ -45,13 +45,16 @@
this.startUnits() ;
if(ServerProperties.argRtuAddr != null && !ServerProperties.argRtuAddr.trim().equals("")){
- System.out.println("搴旂敤閰嶇疆RTU鍦板潃锛�" + ServerProperties.rtuAddr) ;
- }else{
- System.out.println("搴旂敤鍙傛暟RTU鍦板潃锛�" + ServerProperties.argRtuAddr) ;
+ 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{
@@ -102,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