pipIrr-SV.git - Gitblit

			@@ -4,7 +4,6 @@
			import com.dy.common.mw.protocol.*;
			import com.dy.common.mw.protocol.p206V202404.*;
			import com.dy.common.mw.protocol.p206V202404.upVos.DataCd83Vo;
			import com.dy.common.mw.protocol.rtuState.ValveStateInfo;
			import com.dy.common.util.ByteUtil;
			import com.dy.common.util.DateTime;
			import org.apache.logging.log4j.LogManager;
			@@ -24,7 +23,7 @@
			@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,
			@@ -77,9 +76,9 @@
			//低功耗时，尽快发送
			confirmCommand.isQuickSend = true ;
			}
			callback.callback(midRs.reportOrResponse_trueOrFalse);
			callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV202404)(para.data.subData)).subData);

			return new MidResult[]{midRs, confirmCommand} ;
			return new MidResult[]{confirmCommand, midRs} ;
			}
			/**
			* 执行分析
			@@ -90,9 +89,9 @@
			* @throws Exception 异常
			*/
			protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
			DataV202404 dV1 = (DataV202404)data.getSubData() ;
			DataV202404 dV202404 = (DataV202404)data.getSubData() ;
			DataCd83Vo cdData = new DataCd83Vo(CodeV202404.getCodeName(dataCode)) ;
			dV1.subData = cdData ;
			dV202404.subData = cdData ;
			int index = ProtocolConstantV206V202404.dataIndex ;
			cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;

			@@ -134,9 +133,11 @@

			String ymd = "20" + yy + "-" + mm + "-" + dd ;

			cdData.rtuDt = ymd + " " + hh ;
			cdData.rtuDt = ymd + " " + hh + ":00:00" ;

			cdData.dataDt = DateTime.lastXDay_yyyy_MM_dd(ymd, 1) ;

			cdData.dataDt += " 23:59:59" ;
			}

			}