From cf3aaffad0b0f858c869bb21c9a01bf778dd8adc Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 05 十一月 2024 15:27:06 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/DriverV1.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/DriverV1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/DriverV1.java
index 9f58c9b..fc13a7c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/DriverV1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/DriverV1.java
@@ -87,6 +87,7 @@
 			upData.setSubData(dV1) ;
 			
 			this.upCpParams.setValue(ProtocolConstantV206V1.protocolName,
+					ProtocolConstantV206V1.protocolVer,
 					rtuAddr, 
 					upCode,
 					upHex, 
@@ -101,6 +102,9 @@
 					public void callback(Boolean flag) {
 						reportOrResponse_trueOrFalse = flag ;
 						rtuAddrInData = dV1.getRtuAddr() ;
+					}
+					@Override
+					public void notify(NotifyInfo ...infos) {
 					}
 				});
 			}
@@ -136,6 +140,7 @@
 			this.downCpParams.setValue(
 					RtuResultSendWebUrl,
 					ProtocolConstantV206V1.protocolName,
+					command.protocolVersion==null?ProtocolConstantV206V1.protocolVer:command.protocolVersion,
 					rtuAddr, 
 					command.getId(),
 					commandCode, 

--
Gitblit v1.8.0