From d730e2a289b38356e28a04b35a0cb2e7b4c6c282 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 03 七月 2025 10:27:56 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java index ae7d890..66a3ae9 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java @@ -4,13 +4,14 @@ 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.DataCd93_A3Vo; +import com.dy.common.mw.protocol.p206V202404.upVos.DataCd93_9D_A3Vo; import com.dy.common.mw.protocol.rtuState.ValveStateInfo; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @AnnotationCodeUp(ifAny={ CodeV202404.cd_93, + CodeV202404.cd_9D, CodeV202404.cd_A3 }) @SuppressWarnings("unused") @@ -46,7 +47,7 @@ callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV202404)(para.data.subData)).subData); if(para.data != null && para.data.getSubData() != null){ - DataCd93_A3Vo subData = (DataCd93_A3Vo)((DataV202404)para.data.getSubData()).subData ; + DataCd93_9D_A3Vo subData = (DataCd93_9D_A3Vo)((DataV202404)para.data.getSubData()).subData ; //opResult ;//鍏虫车/闃�缁撴灉: 0x00:鎴愬姛 0x81:澶辫触 callback.notify(new ValveStateInfo(subData.clResult.byteValue()==0?false:true)); } @@ -63,7 +64,7 @@ */ protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception { DataV202404 dV202404 = (DataV202404)data.getSubData() ; - DataCd93_A3Vo cdData = new DataCd93_A3Vo(CodeV202404.getCodeName(dataCode)) ; + DataCd93_9D_A3Vo cdData = new DataCd93_9D_A3Vo(CodeV202404.getCodeName(dataCode)) ; dV202404.subData = cdData ; GlParse.parseCd93A3(bs, cdData) ; -- Gitblit v1.8.0