修复插入国标设备时字段错误

648540858

2024-03-17 267085e945a30c7be262dd9c09e208a334935f6b

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

old mode 100644
new mode 100755
@@ -2,10 +2,14 @@

import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.common.InviteInfo;
import com.genersoft.iot.vmp.common.InviteSessionStatus;
import com.genersoft.iot.vmp.common.InviteSessionType;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
@@ -14,16 +18,21 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IMediaService;
import com.genersoft.iot.vmp.service.IPlayService;
import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.vmanager.bean.DeferredResultEx;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.*;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,12 +43,18 @@
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;


/**
 * @author lin
 */
@Tag(name  = "国标设备点播")
@CrossOrigin

@RestController
@RequestMapping("/api/play")
public class PlayController {
@@ -59,6 +74,9 @@
   private IRedisCatchStorage redisCatchStorage;

   @Autowired
   private IInviteStreamService inviteStreamService;

   @Autowired
   private ZLMRESTfulUtils zlmresTfulUtils;

   @Autowired
@@ -76,69 +94,80 @@
   @Autowired
   private UserSetting userSetting;

   @Operation(summary = "开始点播")
   @Operation(summary = "开始点播", security = @SecurityRequirement(name = JwtUtils.HEADER))
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @GetMapping("/start/{deviceId}/{channelId}")
   public DeferredResult<WVPResult<StreamInfo>> play(HttpServletRequest request, @PathVariable String deviceId,
                                         @PathVariable String channelId) {
   public DeferredResult<WVPResult<StreamContent>> play(HttpServletRequest request, @PathVariable String deviceId,
                                           @PathVariable String channelId) {

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

      RequestMessage msg = new RequestMessage();
      RequestMessage requestMessage = new RequestMessage();
      String key = DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId;
      boolean exist = resultHolder.exist(key, null);
      msg.setKey(key);
      requestMessage.setKey(key);
      String uuid = UUID.randomUUID().toString();
      msg.setId(uuid);
      DeferredResult<WVPResult<StreamInfo>> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue());
      DeferredResultEx<WVPResult<StreamInfo>> deferredResultEx = new DeferredResultEx<>(result);
      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("点播超时");
         msg.setData(wvpResult);
         resultHolder.invokeResult(msg);
         requestMessage.setData(wvpResult);
         resultHolder.invokeAllResult(requestMessage);
         inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
         storager.stopPlay(deviceId, channelId);
      });

      if (userSetting.getUseSourceIpAsStreamIp()) {
         // TODO 在点播未成功的情况下在此调用接口点播会导致返回的流地址ip错误
         deferredResultEx.setFilter(result1 -> {
            WVPResult<StreamInfo> wvpResult1 = (WVPResult<StreamInfo>)result1;
            WVPResult<StreamInfo> clone = null;
            try {
               clone = (WVPResult<StreamInfo>)wvpResult1.clone();
            } catch (CloneNotSupportedException e) {
               throw new RuntimeException(e);
            }
            if (clone.getCode() == ErrorCode.SUCCESS.getCode()) {
               StreamInfo data = clone.getData().clone();
               data.channgeStreamIp(request.getLocalName());
               clone.setData(data);
            }
            return clone;
         });
      }

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

      if (!exist) {
         playService.play(newMediaServerItem, deviceId, channelId, null, null, null);
      }
      playService.play(newMediaServerItem, deviceId, channelId, null, (code, msg, data) -> {
         WVPResult<StreamContent> wvpResult = new WVPResult<>();
         if (code == InviteErrorCode.SUCCESS.getCode()) {
            wvpResult.setCode(ErrorCode.SUCCESS.getCode());
            wvpResult.setMsg(ErrorCode.SUCCESS.getMsg());

            if (data != null) {
               StreamInfo streamInfo = (StreamInfo)data;
               if (userSetting.getUseSourceIpAsStreamIp()) {
                  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);
            wvpResult.setMsg(msg);
         }
         requestMessage.setData(wvpResult);
         resultHolder.invokeResult(requestMessage);
      });
      return result;
   }

   @Operation(summary = "停止点播")
   @Operation(summary = "停止点播", security = @SecurityRequirement(name = JwtUtils.HEADER))
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @Parameter(name = "isSubStream", description = "是否子码流（true-子码流，false-主码流），默认为false", required = true)
   @GetMapping("/stop/{deviceId}/{channelId}")
   public JSONObject playStop(@PathVariable String deviceId, @PathVariable String channelId) {
   public JSONObject playStop(@PathVariable String deviceId, @PathVariable String channelId,boolean isSubStream) {

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

@@ -151,24 +180,26 @@
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "设备[" + deviceId + "]不存在");
      }

      StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
      if (streamInfo == null) {
      InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
      if (inviteInfo == null) {
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "点播未找到");
      }

      try {
         logger.warn("[停止点播] {}/{}", device.getDeviceId(), channelId);
         cmder.streamByeCmd(device, channelId, streamInfo.getStream(), null, null);
      } catch (InvalidArgumentException | SipException | ParseException | SsrcTransactionNotFoundException e) {
         logger.error("[命令发送失败] 停止点播， 发送BYE: {}", e.getMessage());
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
      if (InviteSessionStatus.ok == inviteInfo.getStatus()) {
         try {
            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());
         }
      }
      redisCatchStorage.stopPlay(streamInfo);
      inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
      storager.stopPlay(deviceId, channelId);

      storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
      JSONObject json = new JSONObject();
      json.put("deviceId", deviceId);
      json.put("channelId", channelId);
      json.put("isSubStream", isSubStream);
      return json;
   }

@@ -176,19 +207,18 @@
    * 将不是h264的视频通过ffmpeg 转码为h264 + aac
    * @param streamId 流ID
    */
   @Operation(summary = "将不是h264的视频通过ffmpeg 转码为h264 + aac")
   @Operation(summary = "将不是h264的视频通过ffmpeg 转码为h264 + aac", security = @SecurityRequirement(name = JwtUtils.HEADER))
   @Parameter(name = "streamId", description = "视频流ID", required = true)
   @PostMapping("/convert/{streamId}")
   public JSONObject playConvert(@PathVariable String streamId) {
      StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
      if (streamInfo == null) {
         streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
      }
      if (streamInfo == null) {
//      StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);

      InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(null, streamId);
      if (inviteInfo == null || inviteInfo.getStreamInfo() == null) {
         logger.warn("视频转码API调用失败！, 视频流已经停止!");
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到视频流信息, 视频流可能已经停止");
      }
      MediaServerItem mediaInfo = mediaServerService.getOne(streamInfo.getMediaServerId());
      MediaServerItem mediaInfo = mediaServerService.getOne(inviteInfo.getStreamInfo().getMediaServerId());
      JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(mediaInfo, streamId);
      if (!rtpInfo.getBoolean("exist")) {
         logger.warn("视频转码API调用失败！, 视频流已停止推流!");
@@ -219,7 +249,7 @@
   /**
    * 结束转码
    */
   @Operation(summary = "结束转码")
   @Operation(summary = "结束转码", security = @SecurityRequirement(name = JwtUtils.HEADER))
   @Parameter(name = "key", description = "视频流key", required = true)
   @Parameter(name = "mediaServerId", description = "流媒体服务ID", required = true)
   @PostMapping("/convertStop/{key}")
@@ -244,73 +274,47 @@
      }
   }

   @Operation(summary = "语音广播命令")
   @Operation(summary = "语音广播命令", security = @SecurityRequirement(name = JwtUtils.HEADER))
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
    @GetMapping("/broadcast/{deviceId}")
    @PostMapping("/broadcast/{deviceId}")
    public DeferredResult<String> broadcastApi(@PathVariable String deviceId) {
        if (logger.isDebugEnabled()) {
            logger.debug("语音广播API调用");
        }
        Device device = storager.queryVideoDevice(deviceId);
      DeferredResult<String> result = new DeferredResult<>(3 * 1000L);
      String key  = DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId;
      if (resultHolder.exist(key, null)) {
         result.setResult("设备使用中");
         return result;
   @Parameter(name = "deviceId", description = "通道国标编号", required = true)
   @Parameter(name = "timeout", description = "推流超时时间(秒)", required = true)
   @GetMapping("/broadcast/{deviceId}/{channelId}")
   @PostMapping("/broadcast/{deviceId}/{channelId}")
    public AudioBroadcastResult broadcastApi(@PathVariable String deviceId, @PathVariable String channelId, Integer timeout, Boolean broadcastMode) {
      if (logger.isDebugEnabled()) {
         logger.debug("语音广播API调用");
      }
      String uuid  = UUID.randomUUID().toString();
        if (device == null) {

         resultHolder.put(key, key,  result);
         RequestMessage msg = new RequestMessage();
         msg.setKey(key);
         msg.setId(uuid);
         JSONObject json = new JSONObject();
         json.put("DeviceID", deviceId);
         json.put("CmdType", "Broadcast");
         json.put("Result", "Failed");
         json.put("Description", "Device 不存在");
         msg.setData(json);
         resultHolder.invokeResult(msg);
         return result;
      Device device = storager.queryVideoDevice(deviceId);
      if (device == null) {
         throw new ControllerException(ErrorCode.ERROR400.getCode(), "未找到设备： " + deviceId);
      }
      try {
         cmder.audioBroadcastCmd(device, (event) -> {
            RequestMessage msg = new RequestMessage();
            msg.setKey(key);
            msg.setId(uuid);
            JSONObject json = new JSONObject();
            json.put("DeviceID", deviceId);
            json.put("CmdType", "Broadcast");
            json.put("Result", "Failed");
            json.put("Description", String.format("语音广播操作失败，错误码： %s, %s", event.statusCode, event.msg));
            msg.setData(json);
            resultHolder.invokeResult(msg);
         });
      } catch (InvalidArgumentException | SipException | ParseException e) {
         logger.error("[命令发送失败] 语音广播: {}", e.getMessage());
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
      if (channelId == null) {
         throw new ControllerException(ErrorCode.ERROR400.getCode(), "未找到通道： " + channelId);
      }

      result.onTimeout(() -> {
         logger.warn("语音广播操作超时, 设备未返回应答指令");
         RequestMessage msg = new RequestMessage();
         msg.setKey(key);
         msg.setId(uuid);
         JSONObject json = new JSONObject();
         json.put("DeviceID", deviceId);
         json.put("CmdType", "Broadcast");
         json.put("Result", "Failed");
         json.put("Error", "Timeout. Device did not response to broadcast command.");
         msg.setData(json);
         resultHolder.invokeResult(msg);
      });
      resultHolder.put(key, uuid, result);
      return result;
      return playService.audioBroadcast(device, channelId, broadcastMode);

   }

   @Operation(summary = "获取所有的ssrc")
   @Operation(summary = "停止语音广播")
   @Parameter(name = "deviceId", description = "设备Id", required = true)
   @Parameter(name = "channelId", description = "通道Id", required = true)
   @GetMapping("/broadcast/stop/{deviceId}/{channelId}")
   @PostMapping("/broadcast/stop/{deviceId}/{channelId}")
   public void stopBroadcast(@PathVariable String deviceId, @PathVariable String channelId) {
      if (logger.isDebugEnabled()) {
         logger.debug("停止语音广播API调用");
      }
//      try {
//         playService.stopAudioBroadcast(deviceId, channelId);
//      } catch (InvalidArgumentException | ParseException  | SipException e) {
//         logger.error("[命令发送失败] 停止语音: {}", e.getMessage());
//         throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " +  e.getMessage());
//      }
      playService.stopAudioBroadcast(deviceId, channelId);
   }

   @Operation(summary = "获取所有的ssrc", security = @SecurityRequirement(name = JwtUtils.HEADER))
   @GetMapping("/ssrc")
   public JSONObject getSSRC() {
      if (logger.isDebugEnabled()) {
@@ -333,5 +337,36 @@
      return jsonObject;
   }

   @Operation(summary = "获取截图", security = @SecurityRequirement(name = JwtUtils.HEADER))
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @Parameter(name = "isSubStream", description = "是否子码流（true-子码流，false-主码流），默认为false", required = true)
   @GetMapping("/snap")
   public DeferredResult<String> getSnap(String deviceId, String channelId,boolean isSubStream) {
      if (logger.isDebugEnabled()) {
         logger.debug("获取截图: {}/{}", deviceId, channelId);
      }

      DeferredResult<String> result = new DeferredResult<>(3 * 1000L);
      String key  = DeferredResultHolder.CALLBACK_CMD_SNAP + deviceId;
      String uuid  = UUID.randomUUID().toString();
      resultHolder.put(key, uuid,  result);

      RequestMessage message = new RequestMessage();
      message.setKey(key);
      message.setId(uuid);

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

}