From dd694b8a3d05e2d785413182e1c28b25a5b3f431 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期三, 20 十二月 2023 17:24:08 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/forTcp/TcpDownCommandObj.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/forTcp/TcpDownCommandObj.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/forTcp/TcpDownCommandObj.java index 40dad55..573b6c7 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/forTcp/TcpDownCommandObj.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/forTcp/TcpDownCommandObj.java @@ -50,8 +50,8 @@ return removeNodeFromCach ; } - TcpSession tcpSe = TcpSessionCach.getTcpSession(this.result.rtuAddr) ; - Boolean flag = TcpSessionCach.isConnect(this.result.rtuAddr) ; + TcpSession tcpSe = TcpSessionCache.getTcpSession(this.result.rtuAddr) ; + Boolean flag = TcpSessionCache.isConnect(this.result.rtuAddr) ; if(tcpSe == null || flag == null || !flag.booleanValue()){ //鏈浘涓婄嚎鎴栦笉鍦ㄧ嚎 if(!this.result.isCachForOffLine){ @@ -73,8 +73,8 @@ } Long lastSendStamp = tcpSe.lastDownComTime ; - if(lastSendStamp == null || (now - lastSendStamp >= ServerProperties.commandSendInterval)){ - //鏈敹鍒板懡浠ょ粨鏋滐紝鏈揪鍒版渶澶у彂閫佹鏁帮紝RTU鍦ㄧ嚎锛岃秴杩囧懡浠ら棿涓嬪彂闂撮殧锛屼互涓婃弧瓒冲彂閫佸懡浠ゆ潯浠讹紝鎵ц鍙戦�佸懡浠� + if(this.result.isQuickSend || lastSendStamp == null || (now - lastSendStamp >= ServerProperties.commandSendInterval)){ + //鏈敹鍒板懡浠ょ粨鏋滐紝鏈揪鍒版渶澶у彂閫佹鏁帮紝RTU鍦ㄧ嚎锛岄�熷彂鍛戒护鎴栬秴杩囧懡浠や笅鍙戦棿闅旓紝浠ヤ笂婊¤冻鍙戦�佸懡浠ゆ潯浠讹紝鎵ц鍙戦�佸懡浠� tcpSe.ioSession.write(this.result.downBuffer) ; tcpSe.lastDownComTime = now ; if(!this.result.hasResponse){ -- Gitblit v1.8.0