From 211789ba1102a46fd19e75c2643c7ed416ec9e8a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 22 十月 2024 17:33:06 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpIoSessionCallback.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpIoSessionCallback.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpIoSessionCallback.java
index 5971315..3755628 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpIoSessionCallback.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpIoSessionCallback.java
@@ -18,6 +18,12 @@
*/
public void sessionOpened(IoSession session) throws Exception {
log.info("缃戠粶杩炴帴寤虹珛锛岀粓绔綉鍧�鏄細" + session.getRemoteAddress().toString()) ;
+ if(session != null) {
+ String rtuAddr = (String) session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrIdKey);
+ if(rtuAddr != null && !rtuAddr.trim().equals("")){
+ RtuLogDealer.log(rtuAddr, "缃戠粶鎺ュ叆");
+ }
+ }
}
/**
@@ -28,14 +34,14 @@
if(session != null){
String rtuAddr = (String)session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrIdKey) ;
- if(rtuAddr != null){
+ if(rtuAddr != null && !rtuAddr.trim().equals("")){
//璁板綍鐘舵��
RtuStatusDealer.offLine(rtuAddr);
+ RtuLogDealer.log(rtuAddr, "缃戠粶杩炴帴鍏抽棴");
}
-
log.info("缃戠粶杩炴帴鍏抽棴锛�"
+ (rtuAddr==null?"":("缁堢鍦板潃鏄細" + rtuAddr))) ;
- //+ (session==null?"":(session.getRemoteAddress() == null?"":(session.getRemoteAddress().toString()==null?"":("缁堢缃戝潃鏄細" + session.getRemoteAddress().toString()))))) ;
+ //+ (session==null?"":(session.getRemoteAddress() == null?"":(session.getRemoteAddress().toString()==null?"":("锛岀粓绔綉鍧�鏄細" + session.getRemoteAddress().toString()))))) ;
}
}
/**
@@ -46,7 +52,7 @@
String rtuAddr = (String)session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrIdKey) ;
log.error("缃戠粶浼氳瘽鍙戠敓寮傚父锛�"
+ (rtuAddr==null?"":("缁堢鍦板潃鏄細" + rtuAddr))
- + (session==null?"":(session.getRemoteAddress() != null?("缁堢缃戝潃鏄細" + session.getRemoteAddress().toString()):""))
+ + (session==null?"":(session.getRemoteAddress() != null?("锛岀粓绔綉鍧�鏄細" + session.getRemoteAddress().toString()):""))
+ "\n寮傚父娑堟伅锛�" + cause.getMessage(), cause);
}
}
@@ -58,7 +64,7 @@
String rtuAddr = (String)session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrIdKey) ;
log.info("缃戠粶鍙戦�佷簡鏁版嵁锛�"
+ (rtuAddr==null?"":("缁堢鍦板潃鏄細" + rtuAddr))
- + (session==null?"":(session.getRemoteAddress() != null?("缁堢缃戝潃鏄細" + session.getRemoteAddress().toString()):"")) );
+ + (session==null?"":(session.getRemoteAddress() != null?("锛岀粓绔綉鍧�鏄細" + session.getRemoteAddress().toString()):"")) );
}
/**
--
Gitblit v1.8.0