pipIrr-SV.git - Gitblit

			@@ -2,8 +2,7 @@

			import com.dy.common.mw.protocol.*;
			import com.dy.common.mw.protocol.p206V202404.*;
			import com.dy.common.mw.protocol.p206V202404.upVos.DataCd22Vo;
			import com.dy.common.mw.protocol.p206V202404.upVos.DataCd26Vo;
			import com.dy.common.mw.protocol.p206V202404.upVos.DataCdXyVo;
			import com.dy.common.util.ByteUtil;
			import org.apache.logging.log4j.LogManager;
			import org.apache.logging.log4j.Logger;
			@@ -22,17 +21,18 @@
			@Override
			public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception {
			ParseParamsForUpV202404 para = (ParseParamsForUpV202404)params ;
			int bsLen = new CommonV202404().parseDataLen(para.upBuffer) ;
			int bsLen = new CommonV202404().parseDataLen4P202404(para.upBuffer) ;
			if(bsLen > 0){
			this.doParse(para.upBuffer,
			bsLen,
			para.upCode,
			para.data) ;
			}
			log.info("分析上行数据<" + CodeV202404.getCodeName(para.upCode) + " RTU地址=" + para.rtuAddr + ">:\n" + para.data.toString());
			log.info("\n分析命令应答数据<" + CodeV202404.getCodeName(para.upCode) + " RTU地址=" + para.rtuAddr + ">:\n" + para.data.toString());

			MidResultFromRtu midRs = new MidResultFromRtu() ;
			midRs.protocolName = para.protocolName ;//协议名称
			midRs.protocolVersion = para.protocolVersion ;//协议版本号
			midRs.rtuAddr = para.rtuAddr ;//Rtu地址
			midRs.upCode = para.upCode ;//上行数据中的功能码
			midRs.upHex = para.upHex ;//上行数据十六进制形式
			@@ -54,7 +54,7 @@
			*/
			protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
			DataV202404 dV1 = (DataV202404)data.getSubData() ;
			DataCd26Vo cdData = new DataCd26Vo() ;
			DataCdXyVo cdData = new DataCdXyVo(CodeV202404.getCodeName(dataCode)) ;
			dV1.subData = cdData ;
			int index = ProtocolConstantV206V202404.dataIndex ;
			cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;