From 18f9dc6d0f15cad4a74e68fcf87b1a9aa83b5e66 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 18 七月 2024 14:28:28 +0800 Subject: [PATCH] 实现协议中各种命令结果日志数据库永久更新保存功能 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_81_Up.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_81_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_81_Up.java index eec3559..56857a7 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_81_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_81_Up.java @@ -3,6 +3,7 @@ import com.dy.common.mw.protocol.*; import com.dy.common.mw.protocol.p206V1_0_0.*; import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlParse; +import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd81Vo; import com.dy.common.util.ByteUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -84,17 +85,23 @@ protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception { DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ; DataCd81Vo cdData = new DataCd81Vo() ; - dV1.dataCd81Vo = cdData ; + dV1.subData = cdData ; short index = ProtocolConstantV206V1_0_0.dataIndex ; //鎶ヨ鏁版嵁 cdData.alarmVo = GlParse.parseAlarm(bs, index) ; index += 2 ; + + if(bs.length == 28){ + //甯︾灛鏃舵祦閲� + index += 5 ;//鐬椂娴侀噺 + } + //鐘舵�佹暟鎹� cdData.stateVo = GlParse.parseState(bs, index) ; - index += 2 ; + index += 2 ; //鎺у埗鍣ㄦ椂閽� cdData.rtuDt = GlParse.parseTp(bs, index) ; -- Gitblit v1.8.0