From 7d885c1d4c86f40927af50e6e7bfa13aac0c2180 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 十二月 2023 21:47:15 +0800
Subject: [PATCH] 1、common模块优化代码，Command命令中增加RTU命令结果返回webRul; 2、通信中间件增加了接收http下发RTU命令和内部命令的Controler； 3、RTU模拟器和控制器增加了上报完数据是否关闭TCP连接的控制。
---
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