Merge remote-tracking branch 'origin/rtc' into commercial

648540858

2022-06-27 038d360dd4f2dd3c06f5d97dc66ed13fd78de212

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

@@ -13,13 +13,11 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;

import javax.sip.message.Response;

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.IVideoManagerStorager;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;

import java.util.UUID;

@@ -35,7 +33,7 @@
   private SIPCommander cmder;

   @Autowired
   private IVideoManagerStorager storager;
   private IVideoManagerStorage storager;

   @Autowired
   private DeferredResultHolder resultHolder;
@@ -44,7 +42,7 @@
    * 云台控制
    * @param deviceId 设备id
    * @param channelId 通道id
    * @param cmdCode      指令码
    * @param command   控制指令
    * @param horizonSpeed   水平移动速度
    * @param verticalSpeed   垂直移动速度
    * @param zoomSpeed       缩放速度
@@ -54,19 +52,56 @@
   @ApiImplicitParams({
         @ApiImplicitParam(name = "deviceId", value = "设备ID", dataTypeClass = String.class),
         @ApiImplicitParam(name = "channelId", value = "通道ID", dataTypeClass = String.class),
         @ApiImplicitParam(name = "cmdCode", value = "指令码", dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "command", value = "控制指令,允许值: left, right, up, down, upleft, upright, downleft, downright, zoomin, zoomout, stop", dataTypeClass = String.class),
         @ApiImplicitParam(name = "horizonSpeed", value = "水平速度", dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "verticalSpeed", value = "垂直速度", dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "zoomSpeed", value = "缩放速度", dataTypeClass = Integer.class),
   })
   @PostMapping("/control/{deviceId}/{channelId}")
   public ResponseEntity<String> ptz(@PathVariable String deviceId,@PathVariable String channelId,int cmdCode, int horizonSpeed, int verticalSpeed, int zoomSpeed){
   public ResponseEntity<String> ptz(@PathVariable String deviceId,@PathVariable String channelId, String command, int horizonSpeed, int verticalSpeed, int zoomSpeed){

      if (logger.isDebugEnabled()) {
         logger.debug(String.format("设备云台控制 API调用，deviceId：%s ，channelId：%s ，cmdCode：%d ，horizonSpeed：%d ，verticalSpeed：%d ，zoomSpeed：%d",deviceId, channelId, cmdCode, horizonSpeed, verticalSpeed, zoomSpeed));
         logger.debug(String.format("设备云台控制 API调用，deviceId：%s ，channelId：%s ，command：%s ，horizonSpeed：%d ，verticalSpeed：%d ，zoomSpeed：%d",deviceId, channelId, command, horizonSpeed, verticalSpeed, zoomSpeed));
      }
      Device device = storager.queryVideoDevice(deviceId);

      int cmdCode = 0;
      switch (command){
         case "left":
            cmdCode = 2;
            break;
         case "right":
            cmdCode = 1;
            break;
         case "up":
            cmdCode = 8;
            break;
         case "down":
            cmdCode = 4;
            break;
         case "upleft":
            cmdCode = 10;
            break;
         case "upright":
            cmdCode = 9;
            break;
         case "downleft":
            cmdCode = 6;
            break;
         case "downright":
            cmdCode = 5;
            break;
         case "zoomin":
            cmdCode = 16;
            break;
         case "zoomout":
            cmdCode = 32;
            break;
         case "stop":
            cmdCode = 0;
            break;
         default:
            break;
      }
      cmder.frontEndCmd(device, channelId, cmdCode, horizonSpeed, verticalSpeed, zoomSpeed);
      return new ResponseEntity<String>("success",HttpStatus.OK);
   }
@@ -115,16 +150,15 @@
         msg.setData("获取设备预置位超时");
         resultHolder.invokeResult(msg);
      });
      resultHolder.put(key, uuid, result);
      if (resultHolder.exist(key, null)) {
         return result;
      }
      resultHolder.put(key, uuid, result);
      cmder.presetQuery(device, channelId, event -> {
         Response response = event.getResponse();
         RequestMessage msg = new RequestMessage();
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData(String.format("获取设备预置位失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase()));
         msg.setData(String.format("获取设备预置位失败，错误码： %s, %s", event.statusCode, event.msg));
         resultHolder.invokeResult(msg);
      });