From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 十月 2024 16:46:45 +0800
Subject: [PATCH] 1、苏有勋把开关阀报(功能码83)报中的控制器时钟去除掉了,通信中间件解决这个报文时,把开阀报中的开阀时间当作控制器时钟,把关阀报中的关阀时间作为控制器时钟; 2、优化代码。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/PrefixedDataAvailableV1_0_1.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/PrefixedDataAvailableV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/PrefixedDataAvailableV1_0_1.java
index e53f268..625a92e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/PrefixedDataAvailableV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/PrefixedDataAvailableV1_0_1.java
@@ -11,6 +11,7 @@
 
 
 @AnnotationPrefixedDataAvailable(
+		enable = true,
 		protocolName = ProtocolConstantV206V1_0_0.protocolName,
 		priority = ProtocolConstantV206V1_0_0.priority,
 		onLineDataMinLength = ProtocolConstantV206V1_0_0.onLineDataMinLength,
@@ -100,7 +101,7 @@
 			return null ;
 		}
 
-		Integer dataLen = parseCommon.parseDataLen(preByte) ;
+		Integer dataLen = parseCommon.parseFrameLen(preByte) ;
 
 		if(dataLen == null){
 			String headHex = ByteUtil.bytes2Hex(preByte, true) ;

--
Gitblit v1.8.0