From ea58523b67ad59002a1191c3c564258c5b81f6f2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:35:16 +0800
Subject: [PATCH] Revert "1、实现万用token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。"
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/TcpClUnit.java | 69 +---------------------------------
1 files changed, 3 insertions(+), 66 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/TcpClUnit.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/TcpClUnit.java
index ae2a3a1..41b0fe6 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/TcpClUnit.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/TcpClUnit.java
@@ -14,14 +14,12 @@
public class TcpClUnit implements UnitInterface {
- private static final Logger log = LogManager.getLogger(TcpClUnit.class) ;
-
private static TcpClUnit instance = new TcpClUnit() ;
public static TcpClUnitAdapter adapter ;
public static TcpClUnitConfigVo confVo ;
- public static IoSession session ;
+ private static Worker worker ;
private TcpClUnit(){} ;
@@ -39,12 +37,13 @@
if(TcpClUnit.confVo == null){
throw new Exception("Tcp Client妯″潡閰嶇疆瀵硅薄涓嶈兘涓虹┖锛�") ;
}
+ TcpClUnit.worker = Worker.getInstance(TcpClUnit.confVo) ;
}
@Override
public void start(UnitCallbackInterface callback) throws Exception {
System.out.println("Tcp Client妯″潡鎴愬姛鍚姩");
- this.doStart();
+ TcpClUnit.worker.doStart();
callback.call(null) ;
}
@@ -53,67 +52,5 @@
callback.call(null);
}
- private void doStart(){
- 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 exception(Exception e) {
- }
- });
- }catch (Exception e){
- ex = e ;
- }
- if(ex == null){
- break ;
- }else{
- try{
- Thread.sleep(100);
- }catch (Exception e){
- }
- }
- }
- }).start();
- }
-
-
- private void heartBeat(){
- new Thread(new Runnable(){
- @Override
- public void run() {
- while(true){
- try {
- UpHeartBeat.upCd02Data(ServerProperties.rtuAddr);
- Thread.sleep(30000L);
- //Thread.sleep(30000000L);
- }catch (Exception e){
- continue;
- }
- }
- }
- }).start();
- }
}
--
Gitblit v1.8.0