From e7efb53cd598bef3413944f294bfffcb1f65f5e9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 09 九月 2025 16:27:51 +0800
Subject: [PATCH] 完善代码
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpSessionCache.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpSessionCache.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpSessionCache.java
index d03d826..b00eb44 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpSessionCache.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpSessionCache.java
@@ -3,7 +3,7 @@
import java.util.*;
import java.util.Map.Entry;
-import com.dy.common.mw.channel.tcp.TcpIoSessionAttrIdIsRtuAddr;
+import com.dy.common.mw.channel.tcp.TcpIoSessionAttrKeys;
import org.apache.mina.core.session.IoSession;
import com.dy.rtuMw.server.ServerProperties;
@@ -118,8 +118,8 @@
TcpSession tcpSe = map.get(rtuAddr) ;
if(tcpSe != null){
return new Object[]{
- tcpSe.ioSession.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName),
- tcpSe.ioSession.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolVersion)};
+ tcpSe.ioSession.getAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName),
+ tcpSe.ioSession.getAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolVersion)};
}else{
return null ;
}
@@ -128,7 +128,7 @@
/**
* 寰楀埌鎵�鏈夊湪绾夸笌绂荤嚎鏁伴噺缁熻
- * @return [0]=鍦ㄧ嚎鏁伴噺锛孾2]涓婄嚎杩囷紝浣嗗綋鍓嶇绾跨殑鏁伴噺
+ * @return [0]=鍦ㄧ嚎鏁伴噺锛孾1]涓婄嚎杩囷紝浣嗗綋鍓嶇绾跨殑鏁伴噺
*/
public static Integer[] allOnLineStateStatistics(){
synchronized (map){
@@ -215,12 +215,13 @@
}
/**
- * 璁剧疆涓婅鏁版嵁鏃跺埢
+ * 褰撴湁涓婅鏁版嵁鏃�
* @param rtuAddr
*/
- public static void cacheUpDataTime(String rtuAddr){
+ public static void whenUpData(String rtuAddr){
TcpSession tcpSe = map.get(rtuAddr) ;
if(tcpSe != null){
+ tcpSe.lastDownComTime = 0L ;//缃�0锛屼娇绛夊緟lastUpDataTimeLive锛堣config.xml閰嶇疆鏂囦欢锛夋椂闀垮悗锛屽嵆鍒讳笅鍙戠紦瀛樹腑鐨勫懡浠�
tcpSe.lastUpDataTime = System.currentTimeMillis() ;
tcpSe.lastUpDataTimeForOnlineCtrl = System.currentTimeMillis() ;
}
@@ -249,7 +250,7 @@
if(tcpSe.ioSession != null && tcpSe.ioSession.isConnected()){
if(now - tcpSe.lastUpDataTimeForOnlineCtrl > ServerProperties.disconnectedByNoUpDataMinutes){
tcpSe.ioSession.closeNow() ;
- RtuLogDealer.log(entry.getKey(), "鍥犺緝闀挎椂闂存湭鏀朵笂琛屾暟鎹紝璁や负璁惧绂荤嚎");
+ RtuLogDealer.log(entry.getKey(), "鍥犺緝闀挎椂闂存湭鏀跺埌涓婅鏁版嵁锛岃涓鸿澶囩绾�");
}
}
}
--
Gitblit v1.8.0