From 1f46976c9ee72d7889fceee968db9c8aef885eca Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 28 十月 2024 17:28:15 +0800
Subject: [PATCH] 远程监控中开关阀记录查询重构，增加了水价信息，调整了显示内容，优化SQL语句，开闭阀类型改为通信协议中的Common*.*.java中的统一匹配。
---
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