From e2c28bc98587c6edd6a38f06b972ff51d998028f Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期三, 27 十一月 2024 08:52:05 +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 | 77 +++++++++++++++++++++++++++++--------- 1 files changed, 59 insertions(+), 18 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 720cfa1..3005508 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 @@ -35,30 +35,71 @@ public static void main(String[] 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 ; - } - } + if(args.length == 1){ + getArg0(args) ; + }else if(args.length == 2){ + getArg0(args) ; + getArg1(args) ; + }else if(args.length == 3){ + getArg0(args) ; + getArg1(args) ; + getArg2(args) ; + }else if(args.length == 4){ + getArg0(args) ; + getArg1(args) ; + getArg2(args) ; + getArg3(args) ; + }else if(args.length == 5){ + getArg0(args) ; + getArg1(args) ; + getArg2(args) ; + getArg3(args) ; + getArg4(args) ; + } + + if(ServerProperties.argOneDie && ServerProperties.argMultiDie){ + ServerProperties.argOneDie = false ; } } new SpringApplicationBuilder(PipIrrMwSimulateRtuApplication.class) .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鍦板潃 + 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鍚� + 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鍚� + 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 + ServerProperties.serverIp = serverIp ; + } + } + } + private static void getArg4(String[] args){ + if(args[4] != null && !args[4].trim().equals("")){ + Integer serverPort = Integer.parseInt(args[4]) ;//鏈嶅姟绔痯ort + ServerProperties.serverPort = serverPort ; + } + } + /** * Spring瀹瑰櫒鍚姩瀹屾垚鍚庯紝鎵ц涓嬮潰鏂规硶 -- Gitblit v1.8.0