From c4d56f4a2c7687739f3bf0f43bcc1f35c9bbeb8b Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 14 五月 2025 15:18:44 +0800 Subject: [PATCH] 1、表阀一体协议解析同步新版本;2、默认设备是表阀一体(0x02) --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Up.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Up.java index 502752e..c3f34bd 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Up.java @@ -62,9 +62,9 @@ * @throws Exception 寮傚父 */ protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception { - DataV202404 dV1 = (DataV202404)data.getSubData() ; + DataV202404 dV202404 = (DataV202404)data.getSubData() ; DataCd92_A2Vo cdData = new DataCd92_A2Vo(CodeV202404.getCodeName(dataCode)) ; - dV1.subData = cdData ; + dV202404.subData = cdData ; int index = ProtocolConstantV206V202404.dataIndex ; cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ; @@ -77,10 +77,13 @@ index += 8 ; cdData.orderNo = ByteUtil.BCD2String_BE(bs, index, index + 7) ; - index += 8 ; - cdData.opDt = GlParse.parseRtuDt(bs, index) ; + //2025-05-13姹熸捣鍙垹闄� + //index += 8 ; + //cdData.opDt = GlParse.parseRtuDt(bs, index) ; + //index += 6 ; + //cdData.opType = bs[index]; - index += 6 ; + index += 8 ; cdData.opType = bs[index]; index ++ ; -- Gitblit v1.8.0