fix: 系统启动时，停止已启动国标推流抛出异常被系统捕获，启动服务失败。

bradyx

2024-05-15 6e8071d820aa55173e64fd25609caa3b6b9af98a

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/ptz/PtzController.java

old mode 100644
new mode 100755
@@ -1,27 +1,32 @@
package com.genersoft.iot.vmp.vmanager.gb28181.ptz;

 
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;

import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;

import javax.sip.InvalidArgumentException;
import javax.sip.SipException;
import java.text.ParseException;
import java.util.UUID;

@Tag(name  = "云台控制")
@CrossOrigin

@RestController
@RequestMapping("/api/ptz")
public class PtzController {
@@ -47,7 +52,7 @@
    * @param zoomSpeed       缩放速度
    */

   @Operation(summary = "云台控制")
   @Operation(summary = "云台控制", security = @SecurityRequirement(name = JwtUtils.HEADER))
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @Parameter(name = "command", description = "控制指令,允许值: left, right, up, down, upleft, upright, downleft, downright, zoomin, zoomout, stop", required = true)
@@ -94,15 +99,23 @@
            cmdCode = 32;
            break;
         case "stop":
            horizonSpeed = 0;
            verticalSpeed = 0;
            zoomSpeed = 0;
            break;
         default:
            break;
      }
      cmder.frontEndCmd(device, channelId, cmdCode, horizonSpeed, verticalSpeed, zoomSpeed);
      try {
         cmder.frontEndCmd(device, channelId, cmdCode, horizonSpeed, verticalSpeed, zoomSpeed);
      } catch (SipException | InvalidArgumentException | ParseException e) {
         logger.error("[命令发送失败] 云台控制: {}", e.getMessage());
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
      }
   }


   @Operation(summary = "通用前端控制命令")
   @Operation(summary = "通用前端控制命令", security = @SecurityRequirement(name = JwtUtils.HEADER))
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @Parameter(name = "cmdCode", description = "指令码", required = true)
@@ -117,11 +130,16 @@
      }
      Device device = storager.queryVideoDevice(deviceId);

      cmder.frontEndCmd(device, channelId, cmdCode, parameter1, parameter2, combindCode2);
      try {
         cmder.frontEndCmd(device, channelId, cmdCode, parameter1, parameter2, combindCode2);
      } catch (SipException | InvalidArgumentException | ParseException e) {
         logger.error("[命令发送失败] 前端控制: {}", e.getMessage());
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
      }
   }


   @Operation(summary = "预置位查询")
   @Operation(summary = "预置位查询", security = @SecurityRequirement(name = JwtUtils.HEADER))
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @GetMapping("/preset/query/{deviceId}/{channelId}")
@@ -146,13 +164,18 @@
         return result;
      }
      resultHolder.put(key, uuid, result);
      cmder.presetQuery(device, channelId, event -> {
         RequestMessage msg = new RequestMessage();
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData(String.format("获取设备预置位失败，错误码： %s, %s", event.statusCode, event.msg));
         resultHolder.invokeResult(msg);
      });
      try {
         cmder.presetQuery(device, channelId, event -> {
            RequestMessage msg = new RequestMessage();
            msg.setId(uuid);
            msg.setKey(key);
            msg.setData(String.format("获取设备预置位失败，错误码： %s, %s", event.statusCode, event.msg));
            resultHolder.invokeResult(msg);
         });
      } catch (InvalidArgumentException | SipException | ParseException e) {
         logger.error("[命令发送失败] 获取设备预置位: {}", e.getMessage());
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
      }
      return result;
   }
}