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/MyThreadJob.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/MyThreadJob.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/MyThreadJob.java
index 7575093..0f58f3e 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/MyThreadJob.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/MyThreadJob.java
@@ -39,18 +39,24 @@
@Override
public void execute() throws Exception {
- if(session != null){
- if(sendTimes <= ServerProperties.sendTimes){
- log.info("RTU" + rtuAddr + "寮�濮嬩换鍔�");
- log.info("RTU" + rtuAddr + "灏嗚鎵ц" + ServerProperties.sendTimes + "杞浠诲姟锛屽綋鍓嶈疆娆℃槸" + sendTimes);
- sendDataOfP206V1_0_0() ;
- }else{
- log.info("RTU" + rtuAddr + "绛夊緟涓�浼氾紝浠ユ帴鏀堕�氫俊涓棿浠朵笅琛屾暟鎹�");
- if(overStart == 0){
- overStart = System.currentTimeMillis() ;
+ if(!this.isOver){
+ if(session != null){
+ if(sendTimes <= ServerProperties.sendTimes){
+ log.info("RTU" + rtuAddr + "寮�濮嬩换鍔�");
+ log.info("RTU" + rtuAddr + "灏嗚鎵ц" + ServerProperties.sendTimes + "杞浠诲姟锛屽綋鍓嶈疆娆℃槸" + sendTimes);
+ sendDataOfP206V1_0_0() ;
}else{
- long now = System.currentTimeMillis() ;
- if(now - overStart >= 30 * 1000){
+ if(ServerProperties.sendOverThenCloseConnect == 1){
+ log.info("RTU" + rtuAddr + "绛夊緟涓�浼氾紝浠ユ帴鏀堕�氫俊涓棿浠朵笅琛屾暟鎹�");
+ if(overStart == 0){
+ overStart = System.currentTimeMillis() ;
+ }else{
+ long now = System.currentTimeMillis() ;
+ if(now - overStart >= 30 * 1000){
+ this.jobOver() ;
+ }
+ }
+ }else{
this.jobOver() ;
}
}
@@ -95,7 +101,9 @@
}
private void jobOver(){
- session.closeOnFlush() ;
+ if(ServerProperties.sendOverThenCloseConnect == 1){
+ session.closeOnFlush() ;
+ }
this.isOver = true ;
TcpClUnit.clientOver() ;
}
--
Gitblit v1.8.0