pipIrr-SV.git - Gitblit

			@@ -30,9 +30,9 @@
			@Override
			public void execute(Object data) {
			Data d = (Data)data ;
			DataV202404 dV202404 = (DataV202404)d.getSubData() ;//前面任务已经判断不为null
			DataV202404 dV202404 = (DataV202404)d.getSubData() ;
			Object cdObj = dV202404.subData ;
			if(cdObj != null){
			//前面任务已经判断cdObj不为null
			try{
			Object[] objs = this.getTaskResults(TkPreGenObjsV202404.taskId) ;
			DbSv sv = (DbSv)objs[0] ;
			@@ -53,19 +53,18 @@
			this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.endDt, cdData, dV202404.dt) ;
			this.saveHistory(sv, controller, d.getRtuAddr(), cdData.endDt, cdData, dV202404.dt) ;
			}else if(cdObj instanceof DataCd84Vo){
			//设备终端随机自报
			//设备终端刷卡开泵/阀上报
			DataCd84Vo cdData = (DataCd84Vo)(cdObj) ;
			this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.opDt, cdData, dV202404.dt) ;
			this.saveHistory(sv, controller, d.getRtuAddr(), cdData.opDt, cdData, dV202404.dt) ;
			}else if(cdObj instanceof DataCdC2Vo){
			//设备终端随机自报
			//设备终端开关水泵/阀门成功/失败上报
			DataCdC2Vo cdData = (DataCdC2Vo)(cdObj) ;
			this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, dV202404.dt) ;
			this.saveHistory(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, dV202404.dt) ;
			}
			}catch (Exception e){
			log.error("保存控制器报警和状态数据时发生异常", e);
			}
			}
			}
			/**