pipIrr-SV.git - Gitblit

			@@ -4,6 +4,8 @@
			import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
			import com.dy.rtuMw.server.ServerProperties;
			import com.dy.rtuMw.server.forMs.SendMsCache;
			import com.dy.rtuMw.server.msCenter.MsCenterUnit;
			import com.dy.rtuMw.server.msCenter.MsObj;
			import com.dy.rtuMw.server.rtuData.TaskSurpport;
			import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
			import com.dy.common.mw.protocol.Data;
			@@ -47,6 +49,7 @@
			Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
			DbSv sv = (DbSv) objs[0];
			PrController controller = (PrController) objs[1];
			this.toMsCenter(controller, d.getRtuAddr(), dV1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
			this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
			this.saveHistory(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
			if(dataCd81Vo.stateVo != null && dataCd81Vo.stateVo.valveState != null && dataCd81Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
			@@ -63,6 +66,7 @@
			Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
			DbSv sv = (DbSv) objs[0];
			PrController controller = (PrController) objs[1];
			this.toMsCenter(controller, d.getRtuAddr(), dV1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
			this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
			this.saveHistory(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
			/** 阀开工作报，阀门状态一定是打开状态，所以不设置下面数据以备后续任务设置虚拟卡状态
			@@ -80,6 +84,7 @@
			Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
			DbSv sv = (DbSv) objs[0];
			PrController controller = (PrController) objs[1];
			this.toMsCenter(controller, d.getRtuAddr(), dV1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
			this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
			this.saveHistory(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
			if(dataCdC0Vo.stateVo != null && dataCdC0Vo.stateVo.valveState != null && dataCdC0Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
			@@ -99,6 +104,27 @@
			}
			}
			}

			/**
			* 报警状态数据存入消息中心
			* @param controller 控制器对象
			* @param rtuAddr 控制器地址
			* @param dV1 数据对象
			* @param alarmVo 报警对象
			* @param stateVo 状态对象
			*/
			private void toMsCenter(PrController controller, String rtuAddr, DataV1 dV1, DataAlarmVo alarmVo, DataStateVo stateVo){
			if(alarmVo != null && controller != null && alarmVo.hasAlarm()){
			MsObj msObj = new MsObj() ;
			msObj.put("name", "报警");
			msObj.put("rtuAddr", rtuAddr);
			msObj.put("intakeId", controller.getIntakeId());
			msObj.put("alarm", alarmVo.alarmContent());
			msObj.put("dt", dV1.dt);
			MsCenterUnit.getInstance().pushMs(msObj);
			}
			}

			/**
			* 保存报警状态最新数据
			* @param sv 服务