Merge pull request #645 from IKangXu/wvp-28181-2.0

648540858

2022-10-18 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java

@@ -19,7 +19,6 @@
import org.springframework.stereotype.Component;

import javax.sip.InvalidArgumentException;

import javax.sip.RequestEvent;

import javax.sip.ServerTransaction;

import javax.sip.SipException;

import javax.sip.header.*;

import javax.sip.message.Response;

@@ -62,8 +61,9 @@
    @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);



@@ -71,7 +71,6 @@
        if (ssrcTransaction != null) {

            deviceId = ssrcTransaction.getDeviceId();

        }

        ServerTransaction serverTransaction = getServerTransaction(evt);

        // 查询设备是否存在

        Device device = redisCatchStorage.getDevice(deviceId);

        // 查询上级平台是否存在

@@ -79,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)) {

@@ -90,7 +88,7 @@
            }

            if (device == null && parentPlatform == null) {

                // 不存在则回复404

                responseAck(serverTransaction, 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){

                    DeviceNotFoundEvent deviceNotFoundEvent = new DeviceNotFoundEvent(evt.getDialog());

@@ -107,31 +105,23 @@
                    String streamId = sendRtpItem.getStreamId();

                    StreamInfo streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);

                    if (null == streamInfo) {

                        responseAck(serverTransaction, 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(serverTransaction, 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(serverTransaction, 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());

                        }

                    });

                }