From 8c4a723ff13e34152934b84c52267615c4e0fb8b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 06 十二月 2024 10:22:34 +0800
Subject: [PATCH] 升级模拟器增加上报81数据，为上报阀门状态，用81数据代替心跳
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/PipIrrMwSimulateRtuApplication.java | 78 ++++++++++++++++++++++----------------
1 files changed, 45 insertions(+), 33 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/PipIrrMwSimulateRtuApplication.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/PipIrrMwSimulateRtuApplication.java
index 3005508..2e20a49 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/PipIrrMwSimulateRtuApplication.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/PipIrrMwSimulateRtuApplication.java
@@ -2,7 +2,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
-import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -36,25 +35,32 @@
public static void main(String[] args) {
if(args != null && args.length > 0){
if(args.length == 1){
- getArg0(args) ;
+ getArg0(args, 0) ;
}else if(args.length == 2){
- getArg0(args) ;
- getArg1(args) ;
+ getArg0(args, 0) ;
+ getArg1(args, 1) ;
}else if(args.length == 3){
- getArg0(args) ;
- getArg1(args) ;
- getArg2(args) ;
+ getArg0(args, 0) ;
+ getArg1(args, 1) ;
+ getArg2(args, 2) ;
}else if(args.length == 4){
- getArg0(args) ;
- getArg1(args) ;
- getArg2(args) ;
- getArg3(args) ;
+ getArg0(args, 0) ;
+ getArg1(args, 1) ;
+ getArg2(args, 2) ;
+ getArg3(args, 3) ;
}else if(args.length == 5){
- getArg0(args) ;
- getArg1(args) ;
- getArg2(args) ;
- getArg3(args) ;
- getArg4(args) ;
+ getArg0(args, 0) ;
+ getArg1(args, 1) ;
+ getArg2(args, 2) ;
+ getArg3(args, 3) ;
+ getArg4(args,4) ;
+ }else if(args.length == 6){
+ getArg0(args, 0) ;
+ getArg1(args, 1) ;
+ getArg2(args, 2) ;
+ getArg3(args, 3) ;
+ getArg4(args, 4) ;
+ getArg5(args, 5) ;
}
if(ServerProperties.argOneDie && ServerProperties.argMultiDie){
@@ -65,37 +71,43 @@
.web(WebApplicationType.NONE)//涓嶅惎鍔╳eb鏈嶅姟
.run(args);
}
- private static void getArg0(String[] args){
- if(args[0] instanceof String){
- if(args[0] != null && !args[0].trim().equals("")){
- String rtuAddr = (String)args[0] ;//鏈ā鎷熷櫒妯℃嫙RTU鍦板潃
+ private static void getArg0(String[] args, int index){
+ if(args[index] instanceof String){
+ if(args[index] != null && !args[index].trim().equals("")){
+ String rtuAddr = (String)args[index] ;//鏈ā鎷熷櫒妯℃嫙RTU鍦板潃
ServerProperties.argRtuAddr = rtuAddr ;
}
}
}
- private static void getArg1(String[] args){
- if(args[1] != null && !args[1].trim().equals("")){
- Integer oneDie = Integer.parseInt(args[1]) ;//涓�鍖呮锛�1鏄紝0鍚�
+ private static void getArg1(String[] args, int index){
+ if(args[index] != null && !args[index].trim().equals("")){
+ Integer conf = Integer.parseInt(args[index]) ;//蹇冭烦绫诲瀷锛�1锛氬姛鑳界爜02锛�0:鍔熻兘鐮�81
+ ServerProperties.argHeardBeatBy02True81False = conf == 1?true:false ;
+ }
+ }
+ private static void getArg2(String[] args, int index){
+ if(args[index] != null && !args[index].trim().equals("")){
+ Integer oneDie = Integer.parseInt(args[index]) ;//涓�鍖呮锛�1鏄紝0鍚�
ServerProperties.argOneDie = oneDie == 1?true:false ;
}
}
- private static void getArg2(String[] args){
- if(args[2] != null && !args[2].trim().equals("")){
- Integer multiDie = Integer.parseInt(args[2]) ;//澶氬寘姝伙細1鏄紝0鍚�
+ private static void getArg3(String[] args, int index){
+ if(args[index] != null && !args[index].trim().equals("")){
+ Integer multiDie = Integer.parseInt(args[index]) ;//澶氬寘姝伙細1鏄紝0鍚�
ServerProperties.argMultiDie = multiDie == 1?true:false ;
}
}
- private static void getArg3(String[] args){
- if(args[3] instanceof String){
- if(args[3] != null && !args[3].trim().equals("")){
- String serverIp = (String)args[3] ;//鏈嶅姟绔疘P
+ private static void getArg4(String[] args, int index){
+ if(args[index] instanceof String){
+ if(args[index] != null && !args[index].trim().equals("")){
+ String serverIp = (String)args[index] ;//鏈嶅姟绔疘P
ServerProperties.serverIp = serverIp ;
}
}
}
- private static void getArg4(String[] args){
- if(args[4] != null && !args[4].trim().equals("")){
- Integer serverPort = Integer.parseInt(args[4]) ;//鏈嶅姟绔痯ort
+ private static void getArg5(String[] args, int index){
+ if(args[index] != null && !args[index].trim().equals("")){
+ Integer serverPort = Integer.parseInt(args[index]) ;//鏈嶅姟绔痯ort
ServerProperties.serverPort = serverPort ;
}
}
--
Gitblit v1.8.0