pipIrr-SV.git - Gitblit

			@@ -3,6 +3,7 @@
			import com.dy.common.mw.protocol.p206V1_0_0.upVos.*;
			import com.dy.common.util.DateTime;
			import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
			import com.dy.rtuMw.server.ServerProperties;
			import com.dy.rtuMw.server.rtuData.TaskSurpport;
			import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
			import com.dy.common.mw.protocol.Data;
			@@ -46,6 +47,7 @@
			PrController controller = (PrController) objs[1];
			this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1_0_1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
			this.saveHistory(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1_0_1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
			this.updateVirCardNoUseState(sv, controller, dataCd81Vo.stateVo) ;
			}
			} else if (cdObj instanceof DataCd84Vo) {
			DataCd84Vo dataCd84Vo = (DataCd84Vo)cdObj ;
			@@ -55,6 +57,7 @@
			PrController controller = (PrController) objs[1];
			this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1_0_1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
			this.saveHistory(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1_0_1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
			this.updateVirCardNoUseState(sv, controller, dataCd84Vo.stateVo) ;
			}
			} else if (cdObj instanceof DataCdC0Vo) {
			DataCdC0Vo dataCdC0Vo = (DataCdC0Vo)cdObj ;
			@@ -64,6 +67,7 @@
			PrController controller = (PrController) objs[1];
			this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1_0_1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
			this.saveHistory(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1_0_1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
			this.updateVirCardNoUseState(sv, controller, dataCdC0Vo.stateVo) ;
			}
			}
			} catch (Exception e) {
			@@ -82,34 +86,31 @@
			* @param stateVo 状态对象
			*/
			private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, String rtuDt, DataV1_0_1 dV1_0_1, DataAlarmVo alarmVo, DataStateVo stateVo) throws Exception {
			RmAlarmStateLast po = sv.getRmAlarmStateLast(rtuAddr) ;
			RmAlarmStateLast po = sv.getRmAlarmStateLast(controller.getIntakeId()) ;
			if(po == null){
			po = new RmAlarmStateLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
			rtuAddr,
			DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
			DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt),
			stateVo==null?null:stateVo.working,//状态-阀门/泵（1打开、0关闭）
			(byte)0,//剩余水量报警 (1：小于报警上限报警 0：正常)
			(byte)0,//剩余水量为0关泵/阀 (1：剩余水量为0关泵 0：正常)
			(byte)0,//年用水量大于限制水量报警(1：报警 0：正常)
			alarmVo==null?null:alarmVo.meter,// 流量计故障(1：报警，0：正常)
			alarmVo==null?null:alarmVo.loss,// 漏损(偷水)报警(1：报警， 0：正常)
			(byte)0,//流量计损坏(正常通讯但瞬时为0)报警(1：报警，0：正常)
			(byte)0,//电表故障报警(1：报警，0：正常)
			(byte)0,//剩余金额为0(1：报警，0：正常)
			(byte)0,//控制器内门报警(1：报警，0：正常)
			(byte)0,//控制器外门打开报警(1：报警，0：正常)
			(byte)0,//交流缺项报警(1：报警，0：正常)
			(byte)0,//交流过流报警(1：报警，0：正常)
			(byte)0,//三相电欠压报警(1：报警，0：正常)
			stateVo==null?null:stateVo.icCard,//IC卡状态(1、有效，0：无效) ;
			alarmVo==null?null:alarmVo.batteryVolt,//电池电压(1：报警，0：正常)
			alarmVo==null?null:alarmVo.valve//阀门报警(1：报警，0：正常)
			);
			po = new RmAlarmStateLast();
			po.controllerId = controller==null?null:controller.getId() ;
			po.intakeId = controller==null?null:controller.getIntakeId() ;
			po.rtuAddr = rtuAddr ;
			po.valueFrom(dV1_0_1, rtuDt, alarmVo, stateVo);
			if(alarmVo.hasAlarm()){
			po.sendMsTime = System.currentTimeMillis() ;
			this.sendMessage(controller, alarmVo);
			}
			sv.saveRmAlarmStateLast(po) ;
			}else{
			if(po.sendMsTime == null){
			po.sendMsTime = System.currentTimeMillis() ;
			this.sendMessage(controller, alarmVo);
			}else{
			Long now = System.currentTimeMillis() ;
			if(((now - po.sendMsTime) / (1000 * 60)) > ServerProperties.sendDingDingAlarmMsInterval){
			//大于规定的间隔时间
			po.sendMsTime = System.currentTimeMillis() ;
			this.sendMessage(controller, alarmVo);
			}
			}
			po = this.update(controller, po, rtuDt, dV1_0_1, alarmVo, stateVo) ;
			this.updateVirCardNoUseState(sv, controller, stateVo) ;
			sv.updateRmAlarmStateLast(po);
			}
			}
			@@ -124,28 +125,11 @@
			* @param stateVo 状态对象
			*/
			private void saveHistory(DbSv sv, PrController controller, String rtuAddr, String rtuDt, DataV1_0_1 dV1_0_1, DataAlarmVo alarmVo, DataStateVo stateVo) throws Exception {
			RmAlarmStateHistory po = new RmAlarmStateHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
			rtuAddr,
			DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
			DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt),
			stateVo==null?null:stateVo.working,//状态-阀门/泵（1打开、0关闭）
			(byte)0,//剩余水量报警 (1：小于报警上限报警 0：正常)
			(byte)0,//剩余水量为0关泵/阀 (1：剩余水量为0关泵 0：正常)
			(byte)0,//年用水量大于限制水量报警(1：报警 0：正常)
			alarmVo==null?null:alarmVo.meter,// 流量计故障(1：报警，0：正常)
			alarmVo==null?null:alarmVo.loss,// 漏损(偷水)报警(1：报警， 0：正常)
			(byte)0,//流量计损坏(正常通讯但瞬时为0)报警(1：报警，0：正常)
			(byte)0,//电表故障报警(1：报警，0：正常)
			(byte)0,//剩余金额为0(1：报警，0：正常)
			(byte)0,//控制器内门报警(1：报警，0：正常)
			(byte)0,//控制器外门打开报警(1：报警，0：正常)
			(byte)0,//交流缺项报警(1：报警，0：正常)
			(byte)0,//交流过流报警(1：报警，0：正常)
			(byte)0,//三相电欠压报警(1：报警，0：正常)
			stateVo==null?null:stateVo.icCard,//IC卡状态(1、有效，0：无效) ;
			alarmVo==null?null:alarmVo.batteryVolt,//电池电压(1：报警，0：正常)
			alarmVo==null?null:alarmVo.valve//阀门报警(1：报警，0：正常)
			);
			RmAlarmStateHistory po = new RmAlarmStateHistory() ;
			po.controllerId = controller==null?null:controller.getId() ;
			po.intakeId = controller==null?null:controller.getIntakeId() ;
			po.rtuAddr = rtuAddr ;
			po.valueFrom(dV1_0_1, rtuDt, alarmVo, stateVo);
			sv.saveRmAlarmStateHistory(po) ;
			}

			@@ -154,41 +138,20 @@
			po.controllerId = controller==null?null:controller.getId() ;
			po.intakeId = controller==null?null:controller.getIntakeId() ;

			po.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt) ;
			po.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt) ;
			if(alarmVo != null){
			po.alarmBatteryVolt = alarmVo.batteryVolt ;
			po.alarmLoss = alarmVo.loss ;
			po.alarmWaterMeterBreak = alarmVo.meter ;
			po.alarmValve = alarmVo.valve ;
			}/*else{
			po.alarmBatteryVolt = null ;
			po.alarmLoss = null ;
			po.alarmWaterMeterBreak = null ;
			po.alarmValve = null ;
			}*/
			if(stateVo != null){
			po.stateIcEnable = stateVo.icCard ;
			po.valveState = stateVo.working ;
			//po.valvestate = stateVo.valve ;
			}/*else{
			po.stateIcEnable = null ;
			po.valveState = null ;
			//po.valvestate = null ;
			}*/
			po.updateFrom(dV1_0_1, rtuDt, alarmVo, stateVo);
			return po ;

			}


			/**
			* 虚拟卡在取水中的占用状态改为非应用状态
			* 虚拟卡在取水口上的占用状态改为非应用状态
			*/
			private void updateVirCardNoUseState(DbSv sv,
			PrController controller,
			DataStateVo stateVo){
			if(stateVo != null){
			if(stateVo.working != null && stateVo.working.byteValue() == 0){
			if(stateVo.valveState != null && stateVo.valveState.byteValue() == 0){
			//阀门关闭状态
			if(controller != null && controller.getIntakeId() != null){
			//虚拟卡在取水中的占用状态改为非应用状态
			@@ -199,4 +162,8 @@

			}

			private void sendMessage(PrController controller, DataAlarmVo alarmVo){
			String ms = "取水口" + controller.getIntakeName() + "产生报警：" + alarmVo.alarmContent() ;
			}

			}