From 44180ee779c038ad628fcd847a0b8e2ca9b6f4ee Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 22 十一月 2024 10:46:17 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnit.java | 94 +++++++++++++++++++++++++----------------------
1 files changed, 50 insertions(+), 44 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnit.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnit.java
index d698a66..e711393 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnit.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnit.java
@@ -2,7 +2,7 @@
import com.dy.common.mw.UnitAdapterInterface;
import com.dy.common.mw.UnitInterface;
-import com.dy.common.mw.UnitStartedCallbackInterface;
+import com.dy.common.mw.UnitCallbackInterface;
import com.dy.common.util.Callback;
import com.dy.pipIrrMwTestRtu.ServerProperties;
import com.dy.pipIrrMwTestRtu.tcpClient.upData.UpData;
@@ -42,61 +42,58 @@
}
@Override
- public void start(UnitStartedCallbackInterface callback) throws Exception {
+ public void start(UnitCallbackInterface callback) throws Exception {
System.out.println("Tcp Client妯″潡鎴愬姛鍚姩");
this.doStart();
callback.call(null) ;
}
@Override
- public void stop(UnitStartedCallbackInterface callback) throws Exception {
+ public void stop(UnitCallbackInterface callback) throws Exception {
callback.call(null);
}
private void doStart(){
- new Thread(new Runnable(){
- @Override
- public void run() {
- Exception ex = null ;
- while(true){
- ex = null ;
- try {
- new TcpConnect().createSession(
- confVo.mwServerIp,
- confVo.mwServerPort,
- confVo.connectTimeout,
- new TcpHandler(),
- new Callback() {
- @Override
- public void call(Object obj) {
- if (obj == null) {
- log.error("鍒涘缓缃戠粶浼氳瘽杩斿洖涓簄ull");
- } else {
- TcpClUnit.session = (IoSession) obj;
- log.info("鎴愬姛鍒涘缓涓庨�氫俊涓棿浠剁殑缃戠粶杩炴帴");
- UpData.setSession(TcpClUnit.session);
- heartBeat() ;
- }
+ new Thread(() -> {
+ Exception ex ;
+ while(true){
+ ex = null ;
+ try {
+ new TcpConnect().createSession(
+ confVo.mwServerIp,
+ confVo.mwServerPort,
+ confVo.connectTimeout,
+ new TcpHandler(),
+ new Callback() {
+ @Override
+ public void call(Object obj) {
+ if (obj == null) {
+ log.error("鍒涘缓缃戠粶浼氳瘽杩斿洖涓簄ull");
+ } else {
+ TcpClUnit.session = (IoSession) obj;
+ log.info("鎴愬姛鍒涘缓涓庨�氫俊涓棿浠剁殑缃戠粶杩炴帴");
+ UpData.setSession(TcpClUnit.session);
+ heartBeat() ;
}
+ }
- @Override
- public void call(Object... objs) {
- }
+ @Override
+ public void call(Object... objs) {
+ }
- @Override
- public void exception(Exception e) {
- }
- });
+ @Override
+ public void exception(Exception e) {
+ }
+ });
+ }catch (Exception e){
+ ex = e ;
+ }
+ if(ex == null){
+ break ;
+ }else{
+ try{
+ Thread.sleep(100);
}catch (Exception e){
- ex = e ;
- }
- if(ex == null){
- break ;
- }else{
- try{
- Thread.sleep(100);
- }catch (Exception e){
- }
}
}
}
@@ -108,13 +105,22 @@
new Thread(new Runnable(){
@Override
public void run() {
- while(true){
+ if(ServerProperties.onlyOneHeartBeat){
try {
UpHeartBeat.upCd02Data(ServerProperties.rtuAddr);
Thread.sleep(30000L);
//Thread.sleep(30000000L);
}catch (Exception e){
- continue;
+ }
+ }else{
+ while(true){
+ try {
+ UpHeartBeat.upCd02Data(ServerProperties.rtuAddr);
+ Thread.sleep(30000L);
+ //Thread.sleep(30000000L);
+ }catch (Exception e){
+ continue;
+ }
}
}
}
--
Gitblit v1.8.0