From 69cbf8a2fe6c8735f234c7819af9112d72f24dc9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 13 九月 2025 10:39:42 +0800
Subject: [PATCH] 优化代码
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/CommonV2.java | 11 -----------
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java | 2 +-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpUnit.java | 2 +-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpIoSessionAttrKeys.java | 3 +--
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java | 8 --------
5 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpIoSessionAttrKeys.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpIoSessionAttrKeys.java
index 39f5e34..5018a1c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpIoSessionAttrKeys.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpIoSessionAttrKeys.java
@@ -1,8 +1,7 @@
package com.dy.common.mw.channel.tcp;
/**
- * TCP Session涓斁鍏ョ殑灞炴�х殑ID灏辨槸姘磋〃鍙�
- * 褰撳簲鐢╮tuMw鏃剁敤鍒帮紝搴旂敤aepMw鏃剁敤涓嶅埌
+ * TCP Session涓斁鍏ョ殑灞炴�х殑key
*
*/
public class TcpIoSessionAttrKeys {
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpUnit.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpUnit.java
index b6ddc65..54b4168 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpUnit.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpUnit.java
@@ -39,7 +39,7 @@
* @param protocolVersion
* @throws Exception
*/
- public void setIoSessionArrs(IoSession session, String rtuAddr, String protocolName, Short protocolVersion) throws Exception {
+ public void setIoSessionAttrs(IoSession session, String rtuAddr, String protocolName, Short protocolVersion) throws Exception {
session.setAttribute(TcpIoSessionAttrKeys.sessionAttrRtuAddr, rtuAddr) ;
session.setAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName, protocolName) ;
session.setAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolVersion, protocolVersion) ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/CommonV2.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/CommonV2.java
index db3c3bd..cae3753 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/CommonV2.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/CommonV2.java
@@ -1,24 +1,13 @@
package com.dy.common.mw.protocol.p206V2;
-import com.dy.common.mw.channel.tcp.TcpIoSessionAttrKeys;
import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
import com.dy.common.util.ByteUtil;
import com.dy.common.util.ByteUtilUnsigned;
import com.dy.common.util.CRC16;
import com.dy.common.util.CRC8_for_2_0;
-import org.apache.mina.core.session.IoSession;
-
public class CommonV2 {
- /**
- * 鍦↖o浼氳瘽涓缃崗璁悕绉板強鐗堟湰鍙�
- * @param ioSession 浼氳瘽
- */
- public void setThisProtocolArr2IoSession(IoSession ioSession){
- ioSession.setAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName, ProtocolConstantV206V1.protocolName) ;
- ioSession.setAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName, ProtocolConstantV206V1.protocolVer) ;
- }
/**
* 妫�鏌ュご
* @param bs 涓婅瀛楄妭鏁扮粍
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
index 5719fa4..52f9182 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
@@ -12,14 +12,6 @@
public class CommonV202404 {
/**
- * 鍦↖o浼氳瘽涓缃崗璁悕绉板強鐗堟湰鍙�
- * @param ioSession 浼氳瘽
- */
- public void setThisProtocolArr2IoSession(IoSession ioSession){
- ioSession.setAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName, ProtocolConstantV206V202404.protocolName) ;
- ioSession.setAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName, ProtocolConstantV206V202404.protocolVer) ;
- }
- /**
* 妫�鏌ュご
* @param bs 涓婅瀛楄妭鏁扮粍
* @return true鏄�,false鍚�
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java
index e63202d..492db1f 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java
@@ -71,7 +71,7 @@
if(rtuAddr != null && protocolName != null && protocolVersion != null){
//璁剧疆session鐨勫睘鎬D
- TcpUnit.getInstance().setIoSessionArrs(session, rtuAddr, protocolName, protocolVersion) ;
+ TcpUnit.getInstance().setIoSessionAttrs(session, rtuAddr, protocolName, protocolVersion) ;
//缂撳瓨session
TcpSessionCache.putNewTcpSession(rtuAddr, session);
--
Gitblit v1.8.0