From 0be32a3805e1430b82b5bded8bd23946e274fa84 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期三, 06 十一月 2024 14:27:35 +0800 Subject: [PATCH] 优化虚拟卡占用逻辑,占用时写入取水口编号,解除占用时清空虚拟卡编号;工单使用的4个表 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java index 43fd2db..fb408c2 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java @@ -15,7 +15,7 @@ public Boolean isThisProtocolHead(byte[] bs) throws Exception{ if(bs == null){ return null ; - }else if(bs.length >= (ProtocolConstantV206V1.ctrlIndex - 1) + }else if(bs.length >= (ProtocolConstantV206V1.ctrlIndex) && bs[0] == ProtocolConstantV206V1.P_Head_Byte && bs[2] == ProtocolConstantV206V1.P_Head_Byte){ //String vs = this.parseVersion(bs) ; @@ -32,7 +32,9 @@ * @throws Exception 寮傚父 */ public void checkHead(byte[] bs) throws Exception{ - if(bs.length < ProtocolConstantV206V1.onLineDataMinLength || bs[0] != ProtocolConstantV206V1.P_Head_Byte || bs[2] != ProtocolConstantV206V1.P_Head_Byte){ + if(bs.length < ProtocolConstantV206V1.onLineDataMinLength + || bs[0] != ProtocolConstantV206V1.P_Head_Byte + || bs[2] != ProtocolConstantV206V1.P_Head_Byte){ throw new Exception("涓婅鏁版嵁甯уご涓嶆纭紒") ; } } -- Gitblit v1.8.0