wvp-pro.git - Gitblit

			@@ -61,11 +61,14 @@
			@Override
			public void process(RequestEvent evt) {
			logger.debug("接收到消息：" + evt.getRequest());
			String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
			CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
			SIPRequest request = (SIPRequest) evt.getRequest();
			String deviceId = SipUtils.getUserIdFromFromHeader(request);
			CallIdHeader callIdHeader = request.getCallIdHeader();
			// 先从会话内查找
			SsrcTransaction ssrcTransaction = sessionManager.getSsrcTransaction(null, null, callIdHeader.getCallId(), null);
			if (ssrcTransaction != null) { // 兼容海康媒体通知消息from字段不是设备ID的问题

			// 兼容海康媒体通知消息from字段不是设备ID的问题
			if (ssrcTransaction != null) {
			deviceId = ssrcTransaction.getDeviceId();
			}
			// 查询设备是否存在
			@@ -75,7 +78,6 @@
			try {
			if (device != null && parentPlatform != null) {
			logger.warn("[重复]平台与设备编号重复：{}", deviceId);
			SIPRequest request = (SIPRequest) evt.getRequest();
			String hostAddress = request.getRemoteAddress().getHostAddress();
			int remotePort = request.getRemotePort();
			if (device.getHostAddress().equals(hostAddress + ":" + remotePort)) {
			@@ -86,10 +88,12 @@
			}
			if (device == null && parentPlatform == null) {
			// 不存在则回复404
			responseAck(evt, Response.NOT_FOUND, "device "+ deviceId +" not found");
			responseAck(request, Response.NOT_FOUND, "device "+ deviceId +" not found");
			logger.warn("[设备未找到 ]： {}", deviceId);
			if (sipSubscribe.getErrorSubscribe(callIdHeader.getCallId()) != null){
			SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(new DeviceNotFoundEvent(evt.getDialog()));
			DeviceNotFoundEvent deviceNotFoundEvent = new DeviceNotFoundEvent(evt.getDialog());
			deviceNotFoundEvent.setCallId(callIdHeader.getCallId());
			SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(deviceNotFoundEvent);
			sipSubscribe.getErrorSubscribe(callIdHeader.getCallId()).response(eventResult);
			};
			}else {
			@@ -101,31 +105,23 @@
			String streamId = sendRtpItem.getStreamId();
			StreamInfo streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
			if (null == streamInfo) {
			responseAck(evt, Response.NOT_FOUND, "stream " + streamId + " not found");
			responseAck(request, Response.NOT_FOUND, "stream " + streamId + " not found");
			return;
			}
			Device device1 = storager.queryVideoDevice(streamInfo.getDeviceID());
			cmder.playbackControlCmd(device1,streamInfo,new String(evt.getRequest().getRawContent()),eventResult -> {
			// 失败的回复
			try {
			responseAck(evt, eventResult.statusCode, eventResult.msg);
			} catch (SipException e) {
			e.printStackTrace();
			} catch (InvalidArgumentException e) {
			e.printStackTrace();
			} catch (ParseException e) {
			e.printStackTrace();
			responseAck(request, eventResult.statusCode, eventResult.msg);
			} catch (SipException \| InvalidArgumentException \| ParseException e) {
			logger.error("[命令发送失败] 国标级联录像控制: {}", e.getMessage());
			}
			}, eventResult -> {
			// 成功的回复
			try {
			responseAck(evt, eventResult.statusCode);
			} catch (SipException e) {
			e.printStackTrace();
			} catch (InvalidArgumentException e) {
			e.printStackTrace();
			} catch (ParseException e) {
			e.printStackTrace();
			responseAck(request, eventResult.statusCode);
			} catch (SipException \| InvalidArgumentException \| ParseException e) {
			logger.error("[命令发送失败] 国标级联录像控制: {}", e.getMessage());
			}
			});
			}