使用GetMapping替换RequestMapping

648540858

2024-02-29 c581974027cb6ff2123d5a7dd0b39fd3b3217bd4

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

old mode 100644
new mode 100755
@@ -40,6 +40,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.sip.InvalidArgumentException;
import javax.sip.SipException;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.ParseException;
import java.util.List;
import java.util.UUID;
@@ -88,36 +90,38 @@
   @Operation(summary = "开始点播")
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @Parameter(name = "isSubStream", description = "是否子码流（true-子码流，false-主码流），默认为false", required = true)
   @GetMapping("/start/{deviceId}/{channelId}")
   public DeferredResult<WVPResult<StreamContent>> play(HttpServletRequest request, @PathVariable String deviceId,
                                           @PathVariable String channelId,boolean isSubStream) {
                                           @PathVariable String channelId) {

      logger.info("[开始点播] deviceId：{}, channelId：{}, ", deviceId, channelId);
      // 获取可用的zlm
      Device device = storager.queryVideoDevice(deviceId);
      MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);

      RequestMessage requestMessage = new RequestMessage();
      String key = DeferredResultHolder.getPlayKey(deviceId,channelId,device.isSwitchPrimarySubStream(),isSubStream);
      String key = DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId;
      requestMessage.setKey(key);
      String uuid = UUID.randomUUID().toString();
      requestMessage.setId(uuid);
      DeferredResult<WVPResult<StreamContent>> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue());

      result.onTimeout(()->{
         logger.info("点播接口等待超时");
         logger.info("[点播等待超时] deviceId：{}, channelId：{}, ", deviceId, channelId);
         // 释放rtpserver
         WVPResult<StreamInfo> wvpResult = new WVPResult<>();
         wvpResult.setCode(ErrorCode.ERROR100.getCode());
         wvpResult.setMsg("点播超时");
         requestMessage.setData(wvpResult);
         resultHolder.invokeResult(requestMessage);
         resultHolder.invokeAllResult(requestMessage);
         inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
         storager.stopPlay(deviceId, channelId);
      });

      // 录像查询以channelId作为deviceId查询
      resultHolder.put(key, uuid, result);

      playService.play(newMediaServerItem, deviceId, channelId,isSubStream, (code, msg, data) -> {
      playService.play(newMediaServerItem, deviceId, channelId, null, (code, msg, data) -> {
         WVPResult<StreamContent> wvpResult = new WVPResult<>();
         if (code == InviteErrorCode.SUCCESS.getCode()) {
            wvpResult.setCode(ErrorCode.SUCCESS.getCode());
@@ -126,9 +130,20 @@
            if (data != null) {
               StreamInfo streamInfo = (StreamInfo)data;
               if (userSetting.getUseSourceIpAsStreamIp()) {
                  streamInfo.channgeStreamIp(request.getLocalName());
                  streamInfo=streamInfo.clone();//深拷贝
                  String host;
                  try {
                     URL url=new URL(request.getRequestURL().toString());
                     host=url.getHost();
                  } catch (MalformedURLException e) {
                     host=request.getLocalAddr();
                  }
                  streamInfo.channgeStreamIp(host);
               }
               wvpResult.setData(new StreamContent(streamInfo));
            }else {
               wvpResult.setCode(code);
               wvpResult.setMsg(msg);
            }
         }else {
            wvpResult.setCode(code);
@@ -158,30 +173,21 @@
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "设备[" + deviceId + "]不存在");
      }

      InviteInfo inviteInfo =null;
      if(device.isSwitchPrimarySubStream()){
         inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId,isSubStream);
      }else {
         inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
      }
      InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
      if (inviteInfo == null) {
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "点播未找到");
      }
      if (InviteSessionStatus.ok == inviteInfo.getStatus()) {
         try {
            logger.warn("[停止点播] {}/{}", device.getDeviceId(), channelId);
            logger.info("[停止点播] {}/{}", device.getDeviceId(), channelId);
            cmder.streamByeCmd(device, channelId, inviteInfo.getStream(), null, null);
         } catch (InvalidArgumentException | SipException | ParseException | SsrcTransactionNotFoundException e) {
            logger.error("[命令发送失败] 停止点播， 发送BYE: {}", e.getMessage());
            throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
         }
      }
      if(device.isSwitchPrimarySubStream()){
         inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId,isSubStream);
      }else {
         inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
         storager.stopPlay(deviceId, channelId);
      }
      inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
      storager.stopPlay(deviceId, channelId);

      JSONObject json = new JSONObject();
      json.put("deviceId", deviceId);
@@ -360,9 +366,8 @@
         logger.debug("获取截图: {}/{}", deviceId, channelId);
      }

      Device device = storager.queryVideoDevice(deviceId);
      DeferredResult<String> result = new DeferredResult<>(3 * 1000L);
      String key = DeferredResultHolder.getSnapKey(deviceId,channelId,device.isSwitchPrimarySubStream(),isSubStream);
      String key  = DeferredResultHolder.CALLBACK_CMD_SNAP + deviceId;
      String uuid  = UUID.randomUUID().toString();
      resultHolder.put(key, uuid,  result);

@@ -370,8 +375,8 @@
      message.setKey(key);
      message.setId(uuid);

      String fileName = deviceId + "_" + channelId + "_" + DateUtil.getNowForUrl() + "jpg";
      playService.getSnap(deviceId, channelId, fileName,isSubStream, (code, msg, data) -> {
      String fileName = deviceId + "_" + channelId + "_" + DateUtil.getNowForUrl() + ".jpg";
      playService.getSnap(deviceId, channelId, fileName, (code, msg, data) -> {
         if (code == InviteErrorCode.SUCCESS.getCode()) {
            message.setData(data);
         }else {