搭配zgyw，实现gb28181
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
648540858
2021-05-06 fd296d1a6acccbe9f3a72623719bf7101725f4e9 
 src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java


@@ -22,6 +22,7 @@


import org.slf4j.Logger;


import org.slf4j.LoggerFactory;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.http.ResponseEntity;


import org.springframework.stereotype.Service;


import org.springframework.web.context.request.async.DeferredResult;


@@ -58,6 +59,9 @@


    @Autowired


    private VideoStreamSessionManager streamSession;




    @Value("${userSettings.playTimeout}")


    private long playTimeout;






    @Override


    public PlayResult play(String deviceId, String channelId, ZLMHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent) {


@@ -67,7 +71,7 @@


        playResult.setDevice(device);


        UUID uuid = UUID.randomUUID();


        playResult.setUuid(uuid.toString());


        DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();


        DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(playTimeout);


        playResult.setResult(result);


        // 录像查询以channelId作为deviceId查询


        resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result);