From a0f7637ae64c2b13567ecc6f41dcc0ef1d564a33 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期六, 29 六月 2024 09:47:53 +0800 Subject: [PATCH] 2024-06-29 朱宝民 优化命令处理代码,mw相关地址改为配置文件存储 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java index 11134ef..db78c79 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java @@ -4,7 +4,6 @@ import com.dy.common.mw.protocol.*; import com.dy.common.mw.protocol.p206V202404.*; import com.dy.common.mw.protocol.p206V202404.parse.global.GlParse; -import com.dy.common.mw.protocol.p206V202404.upVos.DataCd83Vo; import com.dy.common.mw.protocol.p206V202404.upVos.DataCd84Vo; import com.dy.common.util.ByteUtil; import org.apache.logging.log4j.LogManager; @@ -85,7 +84,7 @@ */ protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception { DataV202404 dV1 = (DataV202404)data.getSubData() ; - DataCd84Vo cdData = new DataCd84Vo() ; + DataCd84Vo cdData = new DataCd84Vo(CodeV202404.getCodeName(dataCode)) ; dV1.subData = cdData ; int index = ProtocolConstantV206V202404.dataIndex ; cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ; @@ -100,7 +99,7 @@ index++ ; cdData.icCardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ; - index += 8 ; + index += 4 ; cdData.icCardNo = GlParse.parseIcCardNo(bs, index, 6, 2) ; index += 8 ; -- Gitblit v1.8.0