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-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailable.java |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailable.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailable.java
index f6a653c..1058dc3 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailable.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailable.java
@@ -3,6 +3,7 @@
 import org.apache.mina.core.buffer.IoBuffer;
 
 import com.dy.common.mw.channel.tcp.PrefixedDataAvailableStatus;
+import org.apache.mina.core.session.IoSession;
 
 public interface PrefixedDataAvailable {
 
@@ -15,10 +16,11 @@
 	 * @return 涓嶆椂鏈崗璁暟鎹椂杩斿洖绌�
 	 * @throws Exception 寮傚父
 	 */
-	PrefixedDataAvailableStatus forOnLine(IoBuffer in,
-			int remain,
-			int minDataLength,
-			int maxDataLength) throws Exception ;
+	PrefixedDataAvailableStatus forOnLine(IoSession ioSession,
+										  IoBuffer in,
+										  int remain,
+										  int minDataLength,
+										  int maxDataLength) throws Exception ;
 
 	/**
 	 * 鍒嗘瀽涓婄嚎鍚�(缃戠粶杩炴帴鍚庨潪绗竴鍖呮暟鎹�)鏄惁鍙幏寰�
@@ -26,12 +28,13 @@
 	 * @param remain 涓�瀹氭椂澶т簬0鐨勬暟鎹�
 	 * @param minDataLength 鏈�灏忔暟鎹暱搴�
 	 * @param maxDataLength 鏈�澶ф暟鎹暱搴︼紝杈惧埌鎴栬秴杩囨闀垮害锛岃涓烘槸鍨冨溇鏁版嵁銆備緥濡傦細鏁版嵁澶撮儴鏄纭殑锛屼絾鍚堟硶鏁版嵁缁撳熬鎬讳笉鍑虹幇锛岃涓烘鏁版嵁鍨冨溇鏁版嵁
-	 * @return
+	 * @return PrefixedDataAvailableStatus
 	 * @throws Exception 寮傚父
 	 */
-	PrefixedDataAvailableStatus forUpData(IoBuffer in,
-			int remain,
-			int minDataLength,
-			int maxDataLength) throws Exception;
+	PrefixedDataAvailableStatus forUpData(IoSession ioSession,
+										  IoBuffer in,
+										  int remain,
+										  int minDataLength,
+										  int maxDataLength) throws Exception;
 
 }

--
Gitblit v1.8.0