From 50864934bd29f13e6014d566630e14a1e8021f19 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 08 五月 2024 13:54:58 +0800 Subject: [PATCH] 1、全部实现王江海制定的协议,但还未联调; 2、通信中间件软件工程改名称为pipIrr-mw-rtu; --- pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpClUnit.java | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpClUnit.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpClUnit.java index 8db9ab8..e2f8660 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpClUnit.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpClUnit.java @@ -71,7 +71,7 @@ public void run() { try { while(true){ - if(!ServerProperties.startWork){ + if(!ServerProperties.startTcpConnectWork){ Thread.sleep(100L); }else{ try{ @@ -101,7 +101,14 @@ } } - startJob() ; + while (true){ + if(!ServerProperties.startRtuReportWork){ + Thread.sleep(100L); + }else{ + startJob() ; + break ; + } + } while(true){ if(totalOverClientCount.longValue() >= totalRtuClientCount.longValue()){ @@ -210,16 +217,16 @@ totalSendDataCount++; if(totalOverClientCount.longValue() >= totalRtuClientCount.longValue()){ RmiClUnit.getInstance().reportHadReportCount(totalSendDataCount); - System.out.println("宸茬粡鍙戦��" + totalSendDataCount + "鏉℃暟鎹�"); + System.out.println("宸茬粡鍙戦��" + totalSendDataCount + "鏉℃暟鎹紙蹇冭烦鍜屼笂鎶ワ級"); }else{ if(totalRtuClientCount > 100){ if(totalSendDataCount % 100 == 0){ RmiClUnit.getInstance().reportHadReportCount(totalSendDataCount); - System.out.println("宸茬粡鍙戦��" + totalSendDataCount + "鏉℃暟鎹�"); + System.out.println("宸茬粡鍙戦��" + totalSendDataCount + "鏉℃暟鎹紙蹇冭烦鍜屼笂鎶ワ級"); } }else{ RmiClUnit.getInstance().reportHadReportCount(totalSendDataCount); - System.out.println("宸茬粡鍙戦��" + totalSendDataCount + "鏉℃暟鎹�"); + System.out.println("宸茬粡鍙戦��" + totalSendDataCount + "鏉℃暟鎹紙蹇冭烦鍜屼笂鎶ワ級"); } } } -- Gitblit v1.8.0