Merge branch '2.6.8' into wvp-28181-2.0

648540858

2023-08-01 e5cba6022fa49747eecba79d4490bc10187befd7

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

@@ -1,6 +1,13 @@
package com.genersoft.iot.vmp.vmanager.gb28181.ptz;

 

import com.genersoft.iot.vmp.conf.exception.ControllerException;
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.tags.Tag;
@@ -8,20 +15,16 @@
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.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 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 {
@@ -94,11 +97,19 @@
            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());
      }
   }


@@ -117,7 +128,12 @@
      }
      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());
      }
   }


@@ -146,13 +162,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;
   }
}