From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期日, 27 十月 2024 16:46:45 +0800 Subject: [PATCH] 1、苏有勋把开关阀报（功能码83）报中的控制器时钟去除掉了，通信中间件解决这个报文时，把开阀报中的开阀时间当作控制器时钟，把关阀报中的关阀时间作为控制器时钟； 2、优化代码。 --- pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/ServerProperties.java | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/ServerProperties.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/ServerProperties.java index 7379686..5aa4fdb 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/ServerProperties.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/ServerProperties.java @@ -7,12 +7,21 @@ //RTU鎴鍦板潃 public static Long rtuAddrEnd = 0L ; //鏈嶅姟绔疘P - public static String serverIp = "" ; + public static String tcpServerIp = "" ; //鏈嶅姟绔笂涓嬫枃 - public static Integer serverPort = 0 ; + public static Integer tcpServerPort = 0 ; + //鍙戦�佹暟鎹暟鎹棿闅� + public static Integer sendInterval = 0 ;//绉� + //姣忎竴杞鍙戦�佹暟鎹紝鍏朵腑鍖呮嫭蹇冭烦鏁版嵁鐨勬鏁� + public static Integer heartbeatTimes = 3 ; //鍙戦�佹暟鎹鏁� public static Integer sendTimes = 0 ; - - //mwTestServer鎺у埗鏄惁鍚姩 - public static boolean startWork = false ; + //鍙戦�佸畬鏁版嵁鍚庯紝鏄惁鍏抽棴TCP杩炴帴锛�1鏄紝0鍚� + public static Integer sendOverThenCloseConnect = 0 ; + + + public static boolean startTcpConnectWork = false ; + + //mwTestServer + public static boolean startRtuReportWork = false ; } -- Gitblit v1.8.0