From 87a49ccc47abbb3505403d174001ceb3a2d2341d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 08 十一月 2024 09:02:46 +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 | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..2bd47f6 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
@@ -59,18 +59,17 @@
String upCode = null ;
try{
CommonV1 cp = new CommonV1() ;
- 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(ProtocolConstantV206V1.protocolName, rtuAddr, "涓ラ噸閿欒锛屼笂琛屾暟鎹瓹RC妫�鏌ュけ璐ワ紝" + crcStr, null))} ;
}
- rtuAddr = cp.parseRtuAddr(upBuffer) ;
- upCode = cp.parseCode(upBuffer) ;
+ upCode = cp.parseCode(upBuffer, p206TrueUgFalse) ;
if(upCode == null){
return new MidResult[]{(new MidResultError(ProtocolConstantV206V1.protocolName, rtuAddr, "涓ラ噸閿欒锛屾湭鑳戒粠涓婅鏁版嵁涓В鏋愬嚭鍔熻兘鐮侊紒", null))} ;
}
- //Integer dataLen = cp.parseFrameLen(upBuffer) ;
Data upData = new Data() ;
upData.setRtuAddr(rtuAddr) ;
upData.setProtocol(ProtocolConstantV206V1.protocolName);
@@ -87,6 +86,7 @@
upData.setSubData(dV1) ;
this.upCpParams.setValue(ProtocolConstantV206V1.protocolName,
+ ProtocolConstantV206V1.protocolVer,
rtuAddr,
upCode,
upHex,
@@ -101,6 +101,9 @@
public void callback(Boolean flag) {
reportOrResponse_trueOrFalse = flag ;
rtuAddrInData = dV1.getRtuAddr() ;
+ }
+ @Override
+ public void notify(NotifyInfo ...infos) {
}
});
}
@@ -136,6 +139,7 @@
this.downCpParams.setValue(
RtuResultSendWebUrl,
ProtocolConstantV206V1.protocolName,
+ command.protocolVersion==null?ProtocolConstantV206V1.protocolVer:command.protocolVersion,
rtuAddr,
command.getId(),
commandCode,
--
Gitblit v1.8.0