From d5a24d68b0ddb3faade00504dabc0643db7d056c Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 26 十一月 2024 11:26:18 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/PipIrrMwSimulateRtuApplication.java | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 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 dcb167d..720cfa1 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 @@ -3,8 +3,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; @@ -32,7 +34,30 @@ 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 == 3){ + if(args[0] instanceof String){ + if(args[0] != null && !args[0].trim().equals("")){ + String rtuAddr = (String)args[0] ;//鏈ā鎷熷櫒妯℃嫙RTU鍦板潃 + ServerProperties.argRtuAddr = rtuAddr ; + } + if(args[1] != null && !args[1].trim().equals("")){ + Integer oneDie = Integer.parseInt(args[1]) ;//涓�鍖呮锛�1鏄紝0鍚� + ServerProperties.argOneDie = oneDie == 1?true:false ; + } + if(args[2] != null && !args[2].trim().equals("")){ + Integer multiDie = Integer.parseInt(args[2]) ;//澶氬寘姝伙細1鏄紝0鍚� + ServerProperties.argMultiDie = multiDie == 1?true:false ; + } + if(ServerProperties.argOneDie && ServerProperties.argMultiDie){ + ServerProperties.argOneDie = false ; + } + } + } + } + new SpringApplicationBuilder(PipIrrMwSimulateRtuApplication.class) + .web(WebApplicationType.NONE)//涓嶅惎鍔╳eb鏈嶅姟 + .run(args); } /** -- Gitblit v1.8.0