From 1a2b07f01ba4616fd9e894dddf474b56d020158c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 15:18:51 +0800
Subject: [PATCH] 整理版本

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java
index 50562ef..a7464d6 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java
@@ -11,12 +11,11 @@
 	}
 
 	public String commandId ;//鍙戦�佸懡浠ょ殑ID锛屽鏋滄槸鍛戒护缁撴灉锛屽苟涓斿尮閰嶄簡涓嬪彂鍛戒护锛屾鍊间笉涓虹┖
-	
+
+	public String rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
 	public String protocolName ;//鍗忚鍚嶇О
-	public String rtuAddr ;//IMEI鍙�
-	public String meterNo ;//姘磋〃鍙�
-	public Integer productId ;//鐢典俊骞冲彴浜у搧ID锛屽綋涓嶅湪鐢典俊骞冲彴杩愯鏃讹紝涓簄ull
-	public String deviceId ;//鐢典俊骞冲彴璁惧ID锛屽綋涓嶅湪鐢典俊骞冲彴杩愯鏃讹紝涓簄ull
+	public Short protocolVersion ;//鍗忚鐗堟湰鍙�
+	public String rtuAddr ;//Rtu鍦板潃
 	public String upCode ;//涓婅鏁版嵁涓殑鍔熻兘鐮�
 	public String upHex ;//涓婅鏁版嵁鍗佸叚杩涘埗褰㈠紡
 	public byte[] upBuffer ;//涓婅鏁版嵁瀛楄妭鏁扮粍
@@ -28,11 +27,15 @@
 		ProtocolUnit.getInstance().adapter.getSingleActionFromRtu(this.protocolName).doAction(this); 
 	}
 	
-	public void setCommandId(String commandId){
+	public void matchedCommand(String commandId, String rtuResultSendWebUrl){
 		this.commandId = commandId ;
 		if(this.data != null){
 			this.data.setCommandId(commandId);
 		}
+		this.rtuResultSendWebUrl = rtuResultSendWebUrl ;
+		if(this.data != null){
+			this.data.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+		}
 	}
 
 }

--
Gitblit v1.8.0