Merge pull request #136 from lawrencehj/wvp-28181-2.0

648540858

2021-07-28 6560a7ad3830f28eedaeb65c84c27e2f9289db5c

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java

@@ -37,7 +37,6 @@
import org.springframework.web.context.request.async.DeferredResult;

import java.util.List;
import java.util.Map;
import java.util.UUID;

import javax.sip.message.Response;
@@ -102,7 +101,7 @@
   @GetMapping("/stop/{deviceId}/{channelId}")
   public DeferredResult<ResponseEntity<String>> playStop(@PathVariable String deviceId, @PathVariable String channelId) {

      logger.debug(String.format("设备预览/回放停止API调用，streamId：%s/$s", deviceId, channelId ));
      logger.debug(String.format("设备预览/回放停止API调用，streamId：%s/%s", deviceId, channelId ));

      UUID uuid = UUID.randomUUID();
      DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
@@ -148,7 +147,7 @@

      // 超时处理
      result.onTimeout(()->{
         logger.warn(String.format("设备预览/回放停止超时，deviceId/channelId：%s/$s ", deviceId, channelId));
         logger.warn(String.format("设备预览/回放停止超时，deviceId/channelId：%s/%s ", deviceId, channelId));
         RequestMessage msg = new RequestMessage();
         msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
         msg.setData("Timeout");