修复在修改设备信息的移动位置订阅由非0值改为0值时不生效的问题。

xubinbin

2023-10-10 4084080a8e8162260afc4733865c347a8a816d49

 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;
@@ -92,6 +94,7 @@
   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);
@@ -104,19 +107,21 @@
      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, (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());
@@ -125,7 +130,15 @@
            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));
            }
@@ -142,8 +155,9 @@
   @Operation(summary = "停止点播")
   @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 ));

@@ -162,7 +176,7 @@
      }
      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());
@@ -170,11 +184,12 @@
         }
      }
      inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);

      storager.stopPlay(deviceId, channelId);

      JSONObject json = new JSONObject();
      json.put("deviceId", deviceId);
      json.put("channelId", channelId);
      json.put("isSubStream", isSubStream);
      return json;
   }

@@ -341,8 +356,9 @@
   @Operation(summary = "获取截图")
   @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) {
   public DeferredResult<String> getSnap(String deviceId, String channelId,boolean isSubStream) {
      if (logger.isDebugEnabled()) {
         logger.debug("获取截图: {}/{}", deviceId, channelId);
      }
@@ -356,7 +372,7 @@
      message.setKey(key);
      message.setId(uuid);

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