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-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplication.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplication.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplication.java
index 98c4ab9..f3daf97 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplication.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplication.java
@@ -1,5 +1,8 @@
package com.dy.pipIrrMwTestRtu;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -20,14 +23,48 @@
"com.dy.common.mybatis..*",
"com.dy.common.singleDataSource..*",
"com.dy.common.webFilter..*",
- "com.dy.common.webListener..*"
+ "com.dy.common.webListener..*",
+ "com.dy.pipIrrGlobal.webCtrls..*"
})
}
)
-public class PipIrrMwTestRtuApplication{
+public class PipIrrMwTestRtuApplication implements CommandLineRunner {
public static void main(String[] args) {
SpringApplication.run(PipIrrMwTestRtuApplication.class, args);
}
+
+ /**
+ * Spring瀹瑰櫒鍚姩瀹屾垚鍚庯紝鎵ц涓嬮潰鏂规硶
+ * @param args 鍙傛暟
+ * @throws Exception 寮傚父
+ */
+ @Override
+ public void run(String... args) throws Exception {
+ try{
+ //绛夊緟涓�涓�
+ Thread.sleep(500L);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ finally {
+ this.startMwSv() ;
+ }
+ }
+
+ private void startMwSv(){
+ if(sv != null){
+ sv.startServer();
+ }
+ }
+
+
+ private Server sv ;
+
+ @Autowired
+ public void setSv(Server sv){
+ this.sv = sv ;
+ }
}
+
--
Gitblit v1.8.0