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 | 85 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 82 insertions(+), 3 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 4d616bd..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,9 +2,10 @@
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;
+import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
@@ -13,7 +14,8 @@
@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.simRtu"},
excludeFilters = {
@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {
- com.dy.common.apiDoc.SpringApiConfig.class //涓�绉嶆帓闄ょ被鐨勬柟寮�
+ com.dy.common.apiDoc.SpringApiConfig.class, //涓�绉嶆帓闄ょ被鐨勬柟寮�
+ com.dy.pipIrrGlobal.config.DingTalk.class
}),
@ComponentScan.Filter(type = FilterType.REGEX, pattern = {
//浜岀鎺掗櫎绫荤殑鏂瑰紡锛屽啓姝ｅ垯琛ㄨ揪寮忥紝闇�瑕佸鐩爣绫荤殑瀹屽叏闄愬畾鍚嶅畬鍏ㄥ尮閰嶏紝鍚﹀垯涓嶇敓鏁�
@@ -31,8 +33,85 @@
public class PipIrrMwSimulateRtuApplication implements CommandLineRunner {
public static void main(String[] args) {
- SpringApplication.run(PipIrrMwSimulateRtuApplication.class, args);
+ if(args != null && args.length > 0){
+ if(args.length == 1){
+ getArg0(args, 0) ;
+ }else if(args.length == 2){
+ getArg0(args, 0) ;
+ getArg1(args, 1) ;
+ }else if(args.length == 3){
+ getArg0(args, 0) ;
+ getArg1(args, 1) ;
+ getArg2(args, 2) ;
+ }else if(args.length == 4){
+ getArg0(args, 0) ;
+ getArg1(args, 1) ;
+ getArg2(args, 2) ;
+ getArg3(args, 3) ;
+ }else if(args.length == 5){
+ 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){
+ ServerProperties.argOneDie = false ;
+ }
+ }
+ new SpringApplicationBuilder(PipIrrMwSimulateRtuApplication.class)
+ .web(WebApplicationType.NONE)//涓嶅惎鍔╳eb鏈嶅姟
+ .run(args);
}
+ 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, 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 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 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 getArg5(String[] args, int index){
+ if(args[index] != null && !args[index].trim().equals("")){
+ Integer serverPort = Integer.parseInt(args[index]) ;//鏈嶅姟绔痯ort
+ ServerProperties.serverPort = serverPort ;
+ }
+ }
+
/**
* Spring瀹瑰櫒鍚姩瀹屾垚鍚庯紝鎵ц涓嬮潰鏂规硶
--
Gitblit v1.8.0