From 276ce2ba5e91523f3c202cce0b0a8bae43630a5e Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 03 六月 2025 10:37:21 +0800 Subject: [PATCH] 表阀一体协议与测控一体阀协议进行兼容时,阀门状态位判断未做兼容修改,本次进行修改并进行必要注释。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_87_Up.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_87_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_87_Up.java index de6d0ea..9111656 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_87_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_87_Up.java @@ -73,10 +73,17 @@ short portLen = ByteUtilUnsigned.byte2Byte(bs, index) ; index++ ; - cdData.domain = ByteUtil.bytes2String_BE(bs, index, index + domainLen - 1) ; - + if(domainLen > 0){ + cdData.domain = ByteUtil.bytes2String_BE(bs, index, index + domainLen - 1) ; + }else{ + cdData.domain = "" ; + } index += domainLen ; - cdData.port = Integer.parseInt(ByteUtil.bytes2String_BE(bs, index, index + portLen - 1)) ; + if(portLen > 0){ + cdData.port = Integer.parseInt(ByteUtil.bytes2String_BE(bs, index, index + portLen - 1)) ; + }else{ + cdData.port = 0 ; + } } } -- Gitblit v1.8.0