pipIrr-SV.git - Gitblit

			@@ -33,7 +33,7 @@
			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 ;//协议名称
			@@ -70,11 +70,12 @@
			if(hasRecord == 1){
			//有记录
			List<DataCd65Vo> list = new ArrayList<>() ;
			DataCd65Vo vo = this.doParseData(bs, index, bsLen, controllerType, projectNo) ;
			index++ ;
			DataCd65Vo vo = this.doParseData(bs, index, bsLen, dataCode, controllerType, projectNo) ;
			while(vo != null){
			index += 39 ;
			index += 43 ;
			list.add(vo) ;
			vo = this.doParseData(bs, index, bsLen, controllerType, projectNo) ;
			vo = this.doParseData(bs, index, bsLen, dataCode, controllerType, projectNo) ;
			}
			dV1.subData = list ;
			}else{
			@@ -82,10 +83,10 @@
			}
			}

			private DataCd65Vo doParseData(byte[] bs, int index, int bsLen, String controllerType,Integer projectNo) throws Exception{
			//每条数据占39字节
			if(bsLen - index > 39){
			DataCd65Vo cdData = new DataCd65Vo() ;
			private DataCd65Vo doParseData(byte[] bs, int index, int bsLen, String dataCode, String controllerType,Integer projectNo) throws Exception{
			//每条数据占43字节
			if(bsLen - index > 43){
			DataCd65Vo cdData = new DataCd65Vo(CodeV202404.getCodeName(dataCode)) ;

			cdData.controllerType = controllerType ;
			cdData.projectNo = projectNo ;
			@@ -96,19 +97,19 @@
			cdData.icCardNo = GlParse.parseIcCardNo(bs, index, 6, 2) ;

			index += 8 ;
			int moneyRemain = ByteUtil.BCD2Int_BE(bs, index, index + 4) ;
			Long moneyRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
			cdData.moneyRemain = moneyRemain/100.0D;

			index += 5 ;
			int waterRemain = ByteUtil.BCD2Int_BE(bs, index, index + 4) ;
			Long waterRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
			cdData.waterRemain = waterRemain/100.0D;

			index += 5 ;
			int thisEle = ByteUtil.BCD2Int_BE(bs, index, index + 3) ;
			int thisEle = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
			cdData.thisEle = thisEle/100.0D;

			index += 4 ;
			int thisWater = ByteUtil.BCD2Int_BE(bs, index, index + 3) ;
			int thisWater = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
			cdData.thisWater = thisWater/100.0D;

			index += 4 ;