From e2c28bc98587c6edd6a38f06b972ff51d998028f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 27 十一月 2024 08:52:05 +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/p206V2/DriverV2.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/DriverV2.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/DriverV2.java
index 7f3b0ef..5dba5f7 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/DriverV2.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/DriverV2.java
@@ -3,7 +3,9 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.util.DateTime;
-@AnnotationDriver(enable = true, name= ProtocolConstantV206V2.protocolName)
+@AnnotationDriver(enable = true,
+ name= ProtocolConstantV206V2.protocolName,
+ version= ProtocolConstantV206V2.protocolVer)
public class DriverV2 extends Driver {
private static String scanRootPackage = "com.dy.common.mw.protocol.p206V2" ;
@@ -57,36 +59,37 @@
this.clear();
boolean isFail = false ;
String upCode = null ;
+ Short protocolVersion = null ;
try{
CommonV2 cp = new CommonV2() ;
- cp.checkHead(upBuffer) ;
+ Boolean p206TrueUgFalse = cp.protocolType_p206TrueUgFalse(upBuffer) ;
+ //鍒版澶勪簡锛宲206TrueUgFalse涓嶅彲鑳戒负绌轰簡
cp.checkTail(upBuffer) ;
- String crcStr = cp.checkCrc_str(upBuffer) ;
+ String crcStr = cp.checkCrc_str(upBuffer, p206TrueUgFalse) ;
if(crcStr != null){
return new MidResult[]{(new MidResultError(ProtocolConstantV206V2.protocolName, rtuAddr, "涓ラ噸閿欒锛屼笂琛屾暟鎹瓹RC妫�鏌ュけ璐ワ紝" + crcStr, null))} ;
}
- rtuAddr = cp.parseRtuAddr(upBuffer) ;
- upCode = cp.parseCode(upBuffer) ;
+ protocolVersion = cp.parseVersion(upBuffer) ;
+ upCode = cp.parseCode(upBuffer, p206TrueUgFalse) ;
if(upCode == null){
return new MidResult[]{(new MidResultError(ProtocolConstantV206V2.protocolName, rtuAddr, "涓ラ噸閿欒锛屾湭鑳戒粠涓婅鏁版嵁涓В鏋愬嚭鍔熻兘鐮侊紒", null))} ;
}
- //Integer dataLen = cp.parseFrameLen(upBuffer) ;
Data upData = new Data() ;
upData.setRtuAddr(rtuAddr) ;
upData.setProtocol(ProtocolConstantV206V2.protocolName);
- upData.setProtocolVer(ProtocolConstantV206V2.protocolVer);
+ upData.setProtocolVer(protocolVersion);
upData.setCode(upCode) ;
upData.setHex(upHex) ;
DataV2 dV2 = new DataV2() ;
- //dV2.version = cp.parseVersion(upBuffer) ;
dV2.rtuAddr = rtuAddr ;
dV2.dt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
upData.setSubData(dV2) ;
this.upCpParams.setValue(ProtocolConstantV206V2.protocolName,
+ protocolVersion,
rtuAddr,
upCode,
upHex,
@@ -101,6 +104,9 @@
public void callback(Boolean flag) {
reportOrResponse_trueOrFalse = flag ;
rtuAddrInData = dV2.getRtuAddr() ;
+ }
+ @Override
+ public void notify(NotifyInfo ...infos) {
}
});
}
@@ -136,6 +142,7 @@
this.downCpParams.setValue(
RtuResultSendWebUrl,
ProtocolConstantV206V2.protocolName,
+ command.protocolVersion==null?ProtocolConstantV206V2.protocolVer:command.protocolVersion ,
rtuAddr,
command.getId(),
commandCode,
--
Gitblit v1.8.0