From 67be727c779e1af1058a70232a6bdd8db0bd59c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 25 二月 2025 08:33:14 +0800
Subject: [PATCH] 表阀一体机（王江海制定）通信协议：1、完善关阀类型；2、完善注释。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/DriverParserDataCallback.java |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/DriverParserDataCallback.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/DriverParserDataCallback.java
index 5ca3e20..a28c592 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/DriverParserDataCallback.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/DriverParserDataCallback.java
@@ -4,23 +4,22 @@
 
 	/**
 	 * 瑙ｆ瀽涓婅鏁版嵁鍚庡洖璋�
-	 * @param rtuAddr 涓婅鏁版嵁鍗忚澶翠腑鐨処MEI鍙�
-	 * @param meterNo 涓婅鏁版嵁鍗忚澶翠腑鐨勬按琛ㄥ彿
+	 * @param rtuAddr 涓婅鏁版嵁鍗忚澶翠腑RtuAddr
 	 * @param code 涓婅鏁版嵁 鍔熻兘鐮�
 	 * @param upHex 涓婅鏁版嵁
 	 * @param reportOrResponse_trueOrFalse 涓婅鏁版嵁鏄富鍔ㄤ笂鎶ヨ繕鏄懡浠ょ粨鏋�
 	 * @param parseFail 涓婅鏁版嵁瑙ｆ瀽鏄惁澶辫触
-	 * @param rtuAddrInData 涓婅鏁版嵁涓湪鍗忚鏁版嵁涓殑IMEI鍙凤紝
-	 * @param meterNoInData 涓婅鏁版嵁涓湪鍗忚鏁版嵁涓殑姘磋〃鍙凤紝
-	 * 	鈥滀慨鏀筊TU缁堢绠＄悊閰嶇疆鍙傛暟鈥濆懡浠ょ殑杩斿洖鏁版嵁锛屽叾鍗忚澶翠腑鐨処MEI鍙蜂笌鏁版嵁涓殑IMEI鍙蜂笉涓�鏍凤紝
-	 *  濡傛灉RTU涓嶈兘鍏抽棴缃戠粶锛岄偅涔坰essionCach涓殑IMEI鍙锋�绘槸鐢ㄤ慨鏀瑰墠鐨処MEI鍙凤紝浣垮緱浠ュ悗涓婅鏁版嵁鐨勪笉鑳芥壘鍒扮紦瀛樹腑鐨凷ession
+	 * @param rtuAddrInData 涓婅鏁版嵁涓湪鍗忚鏁版嵁涓殑Rtu鍦板潃锛�
+	 * @param codeData 鍔熻兘瀵瑰簲鐨勬暟鎹璞�
+	 * 	鈥滀慨鏀筊TU缁堢绠＄悊閰嶇疆鍙傛暟鈥濆懡浠ょ殑杩斿洖鏁版嵁锛屽叾鍗忚澶翠腑鐨凴tu鍦板潃涓庢暟鎹腑鐨凴tu鍦板潃涓嶄竴鏍凤紝
+	 *  濡傛灉RTU涓嶈兘鍏抽棴缃戠粶锛岄偅涔坰essionCach涓殑Rtu鍦板潃鎬绘槸鐢ㄤ慨鏀瑰墠鐨凴tu鍦板潃锛屼娇寰椾互鍚庝笂琛屾暟鎹殑涓嶈兘鎵惧埌缂撳瓨涓殑Session
 	 */
 	void callback(String rtuAddr,
-			String meterNo, 
-			String code, 
-			String upHex, 
-			Boolean reportOrResponse_trueOrFalse, 
-			boolean parseFail,
-			String rtuAddrInData,
-			String meterNoInData) ;
+				  String code,
+				  String codeName,
+				  String upHex,
+				  Boolean reportOrResponse_trueOrFalse,
+				  boolean parseFail,
+				  String rtuAddrInData,
+				  Object ...codeData) ;
 }

--
Gitblit v1.8.0