pipIrr-SV.git - Gitblit

			@@ -177,12 +177,13 @@
			* 执行成功
			* 更改虚拟卡状态：是否使用中、最后操作、最后操作时间
			*/
			//SeVirtualCard virtualCard = new SeVirtualCard();
			//virtualCard.setId(vcId);
			//virtualCard.setInUse((byte) 1);
			//virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
			//virtualCard.setLastOperateTime(new Date());
			//seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
			// SeVirtualCard virtualCard = new SeVirtualCard();
			// virtualCard.setId(vcId);
			// virtualCard.setInUse((byte) 1);
			// virtualCard.setIntakeId(intakeId);
			// virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
			// virtualCard.setLastOperateTime(new Date());
			// seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);

			// 回调返回的内容
			//Data myData = (Data)response_CallBack.getContent();
			@@ -240,25 +241,33 @@
			// 回调超时
			if(response_CallBack.getContent().toString().equals(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage())) {
			/**
			* 糊掉超时，暂时认为执行成功
			* 更改虚拟卡状态：是否使用中、最后操作、最后操作时间
			* 返回开阀需要的参数
			* 回调超时，暂时认为执行失败
			* 命令置为失败
			* 虚拟卡依旧保持使用中的状态
			* 不返回关阀参数
			*/
			SeVirtualCard virtualCard = new SeVirtualCard();
			virtualCard.setId(vcId);
			virtualCard.setInUse((byte) 1);
			virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
			virtualCard.setLastOperateTime(new Date());
			seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);

			JSONObject job_response = new JSONObject();
			job_response.put("message", RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
			job_response.put("rtuAddr", rtuAddr);
			job_response.put("vcNum", vc.getVcNum());
			job_response.put("orderNo", orderNo);
			//job_response.put("operator", operator);
			return BaseResponseUtils.buildSuccess(job_response);
			//return BaseResponseUtils.buildSuccess(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
			rmCommandHistory = new RmCommandHistory();
			rmCommandHistory.setId(comId);
			rmCommandHistory.setResult((byte)0);
			commandSv.updateCommandResult(rmCommandHistory);

			//SeVirtualCard virtualCard = new SeVirtualCard();
			//virtualCard.setId(vcId);
			//virtualCard.setInUse((byte) 1);
			//virtualCard.setIntakeId(intakeId);
			//virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
			//virtualCard.setLastOperateTime(new Date());
			//seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);

			//JSONObject job_response = new JSONObject();
			//job_response.put("message", RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
			//job_response.put("rtuAddr", rtuAddr);
			//job_response.put("vcNum", vc.getVcNum());
			//job_response.put("orderNo", orderNo);
			//return BaseResponseUtils.buildSuccess(job_response);
			return BaseResponseUtils.buildFail(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());

			}

			// 回调成功，再判断执行是否成功
			@@ -278,6 +287,7 @@
			SeVirtualCard virtualCard = new SeVirtualCard();
			virtualCard.setId(vcId);
			virtualCard.setInUse((byte) 1);
			virtualCard.setIntakeId(intakeId);
			virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
			virtualCard.setLastOperateTime(new Date());
			seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
			@@ -391,13 +401,12 @@
			* 执行成功
			* 更改虚拟卡状态：是否使用中、最后操作、最后操作时间
			*/
			//Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
			//SeVirtualCard virtualCard = new SeVirtualCard();
			//virtualCard.setId(vcId);
			//SeVirtualCard virtualCard = seVirtualCardMapper.getVcCardByNum(vcNum);
			//virtualCard.setInUse((byte) 0);
			//virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
			//virtualCard.setIntakeId(null);
			//virtualCard.setLastOperate(LastOperateENUM.CLOSE_VALVE.getCode());
			//virtualCard.setLastOperateTime(new Date());
			//seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
			//seVirtualCardMapper.updateByPrimaryKey(virtualCard);

			// 回调返回的内容
			Data myData = (Data)response_CallBack.getContent();
			@@ -446,17 +455,24 @@
			// 回调超时
			if(response_CallBack.getContent().toString().equals(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage())) {
			/**
			* 糊掉超时，暂时认为执行成功
			* 更改虚拟卡状态：是否使用中、最后操作、最后操作时间
			* 回调超时，暂时认为执行失败
			* 命令置为失败
			* 虚拟卡依旧保持使用中的状态
			*/
			Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
			SeVirtualCard virtualCard = new SeVirtualCard();
			virtualCard.setId(vcId);
			virtualCard.setInUse((byte) 0);
			virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
			virtualCard.setLastOperateTime(new Date());
			seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
			return BaseResponseUtils.buildSuccess(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());

			rmCommandHistory = new RmCommandHistory();
			rmCommandHistory.setId(comId);
			rmCommandHistory.setResult((byte)0);
			commandSv.updateCommandResult(rmCommandHistory);


			//SeVirtualCard virtualCard = seVirtualCardMapper.getVcCardByNum(vcNum);
			//virtualCard.setInUse((byte) 0);
			//virtualCard.setIntakeId(null);
			//virtualCard.setLastOperate(LastOperateENUM.CLOSE_VALVE.getCode());
			//virtualCard.setLastOperateTime(new Date());
			//seVirtualCardMapper.updateByPrimaryKey(virtualCard);
			return BaseResponseUtils.buildFail(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
			}

			// 回调成功，再判断执行是否成功
			@@ -473,13 +489,12 @@
			* 执行成功
			* 更改虚拟卡状态：是否使用中、最后操作、最后操作时间
			*/
			Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
			SeVirtualCard virtualCard = new SeVirtualCard();
			virtualCard.setId(vcId);
			SeVirtualCard virtualCard = seVirtualCardMapper.getVcCardByNum(vcNum);
			virtualCard.setInUse((byte) 0);
			virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
			virtualCard.setIntakeId(null);
			virtualCard.setLastOperate(LastOperateENUM.CLOSE_VALVE.getCode());
			virtualCard.setLastOperateTime(new Date());
			seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
			seVirtualCardMapper.updateByPrimaryKey(virtualCard);

			// 回调返回的内容
			Data myData = (Data)response_CallBack.getContent();
			@@ -514,7 +529,7 @@

			VoUnclosedParam voUnclosedParam = commandSv.getUncloseParam(intakeId);
			if(voUnclosedParam == null) {
			return BaseResponseUtils.buildFail(RemoteResultCode.VALVE_CLOSED.getMessage());
			return BaseResponseUtils.buildSuccess(RemoteResultCode.VALVE_CLOSED.getMessage());
			}
			String rtuAddr = voUnclosedParam.getRtuAddr();
			String vcNum = voUnclosedParam.getVcNum();
			@@ -642,17 +657,24 @@
			// 回调超时
			if(response_CallBack.getContent().toString().equals(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage())) {
			/**
			* 糊掉超时，暂时认为执行成功
			* 更改虚拟卡状态：是否使用中、最后操作、最后操作时间
			* 回调超时，暂时认为执行失败
			* 命令置为失败
			* 虚拟卡依旧保持使用中的状态
			*/
			Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
			SeVirtualCard virtualCard = new SeVirtualCard();
			virtualCard.setId(vcId);
			virtualCard.setInUse((byte) 0);
			virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
			virtualCard.setLastOperateTime(new Date());
			seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
			return BaseResponseUtils.buildSuccess(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());

			rmCommandHistory = new RmCommandHistory();
			rmCommandHistory.setId(comId);
			rmCommandHistory.setResult((byte)0);
			commandSv.updateCommandResult(rmCommandHistory);

			//Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
			//SeVirtualCard virtualCard = new SeVirtualCard();
			//virtualCard.setId(vcId);
			//virtualCard.setInUse((byte) 0);
			//virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
			//virtualCard.setLastOperateTime(new Date());
			//seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
			return BaseResponseUtils.buildFail(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
			}

			// 回调成功，再判断执行是否成功