pipIrr-SV.git - Gitblit

			@@ -7,6 +7,8 @@
			import com.dy.pipIrrGlobal.pojoPr.PrController;
			import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
			import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateLast;
			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 org.apache.logging.log4j.LogManager;
			@@ -41,6 +43,7 @@
			if(cdObj instanceof DataCd81Vo){
			//设备终端随机自报
			DataCd81Vo cdData = (DataCd81Vo)(cdObj) ;
			this.toMsCenter(controller, d.getRtuAddr(), dV202404, cdData, dV202404.dt);
			this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, dV202404.dt) ;
			this.saveHistory(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, dV202404.dt) ;
			if(cdData.statePump != null && cdData.statePump.byteValue() == AlarmVo.DevCloseState){
			@@ -52,6 +55,7 @@
			}else if(cdObj instanceof DataCd80_5BVo){
			//设备终端工作上报 + 查询设备终端实时值
			DataCd80_5BVo cdData = (DataCd80_5BVo)(cdObj) ;
			this.toMsCenter(controller, d.getRtuAddr(), dV202404, cdData, dV202404.dt);
			this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, dV202404.dt) ;
			this.saveHistory(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, dV202404.dt) ;
			if(cdData.statePump != null && cdData.statePump.byteValue() == AlarmVo.DevCloseState){
			@@ -63,6 +67,7 @@
			}else if(cdObj instanceof DataCd93_A3Vo){
			//平台/APP远程关闭水泵/阀门 + 刷卡关泵/阀上报
			DataCd93_A3Vo cdData = (DataCd93_A3Vo)(cdObj) ;
			this.toMsCenter(controller, d.getRtuAddr(), dV202404, cdData, dV202404.dt);
			this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.endDt, cdData, dV202404.dt) ;
			this.saveHistory(sv, controller, d.getRtuAddr(), cdData.endDt, cdData, dV202404.dt) ;
			if(cdData.statePump != null && cdData.statePump.byteValue() == AlarmVo.DevCloseState){
			@@ -74,6 +79,7 @@
			}else if(cdObj instanceof DataCd84Vo){
			//设备终端刷卡开泵/阀上报
			DataCd84Vo cdData = (DataCd84Vo)(cdObj) ;
			this.toMsCenter(controller, d.getRtuAddr(), dV202404, cdData, dV202404.dt);
			this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.openDt, cdData, dV202404.dt) ;
			this.saveHistory(sv, controller, d.getRtuAddr(), cdData.openDt, cdData, dV202404.dt) ;
			if(cdData.statePump != null && cdData.statePump.byteValue() == AlarmVo.DevCloseState){
			@@ -85,6 +91,7 @@
			}else if(cdObj instanceof DataCdC2Vo){
			//设备终端开关水泵/阀门成功/失败上报
			DataCdC2Vo cdData = (DataCdC2Vo)(cdObj) ;
			this.toMsCenter(controller, d.getRtuAddr(), dV202404, cdData, dV202404.dt);
			this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, dV202404.dt) ;
			this.saveHistory(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, dV202404.dt) ;
			if(cdData.statePump != null && cdData.statePump.byteValue() == AlarmVo.DevCloseState){
			@@ -101,6 +108,38 @@
			this.toNextTasks(d);
			}
			}

			/**
			* 报警状态数据存入消息中心
			* @param controller 控制器对象
			* @param rtuAddr 控制器地址
			* @param dataV202404 数据对象
			* @param alarmVo 报警+状态对象
			*/
			private void toMsCenter(PrController controller, String rtuAddr, DataV202404 dataV202404, AlarmVo alarmVo, String dt){
			if(alarmVo != null && controller != null){
			if(alarmVo.hasAlarm()){
			MsObj msObj = new MsObj() ;
			msObj.put("name", "报警");
			msObj.put("rtuAddr", rtuAddr);
			msObj.put("intakeId", controller.getIntakeId());
			msObj.put("state", alarmVo.alarmContent());
			msObj.put("dt", dt);
			MsCenterUnit.getInstance().pushMs(msObj);
			}
			if(alarmVo.statePump != null){
			MsObj msObj = new MsObj() ;
			msObj.put("name", "阀态");
			msObj.put("rtuAddr", rtuAddr);
			msObj.put("intakeId", controller.getIntakeId());
			msObj.put("state", alarmVo.statePump);
			msObj.put("stateName", alarmVo.statePump==1?"开":"关");
			msObj.put("dt", dt);
			MsCenterUnit.getInstance().pushMs(msObj);
			}
			}
			}

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