From 7559ffe69fdbf3a0224c5abaa867af92d567fc51 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 02 十二月 2024 10:25:42 +0800
Subject: [PATCH] 1、完善代码； 2、补全RTU状态采集（阀门状态）。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/DriverV2.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 f1defc1..3297dbb 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
@@ -1,9 +1,12 @@
package com.dy.common.mw.protocol.p206V2;
import com.dy.common.mw.protocol.*;
+import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
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" ;
@@ -60,19 +63,18 @@
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) ;
protocolVersion = cp.parseVersion(upBuffer) ;
- upCode = cp.parseCode(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);
@@ -106,6 +108,7 @@
}
@Override
public void notify(NotifyInfo ...infos) {
+ notify.notify(rtuAddr, ProtocolConstantV206V1.protocolName, ProtocolConstantV206V1.protocolVer, infos);
}
});
}
--
Gitblit v1.8.0