Commit b4c59662ac466e4f1cf3d221c7753ad1508c3c1a

Authored by 648540858
2 parents 0c2c87d4 06474b81

Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/ptz/PtzController.java
@@ -54,7 +54,7 @@ public class PtzController { @@ -54,7 +54,7 @@ public class PtzController {
54 @ApiImplicitParams({ 54 @ApiImplicitParams({
55 @ApiImplicitParam(name = "deviceId", value = "设备ID", dataTypeClass = String.class), 55 @ApiImplicitParam(name = "deviceId", value = "设备ID", dataTypeClass = String.class),
56 @ApiImplicitParam(name = "channelId", value = "通道ID", dataTypeClass = String.class), 56 @ApiImplicitParam(name = "channelId", value = "通道ID", dataTypeClass = String.class),
57 - @ApiImplicitParam(name = "command", value = "控制指令,允许值: left, right, up, down, upleft, upright, downleft, downright, zoomin, zoomout, stop", dataTypeClass = Integer.class), 57 + @ApiImplicitParam(name = "command", value = "控制指令,允许值: left, right, up, down, upleft, upright, downleft, downright, zoomin, zoomout, stop", dataTypeClass = String.class),
58 @ApiImplicitParam(name = "horizonSpeed", value = "水平速度", dataTypeClass = Integer.class), 58 @ApiImplicitParam(name = "horizonSpeed", value = "水平速度", dataTypeClass = Integer.class),
59 @ApiImplicitParam(name = "verticalSpeed", value = "垂直速度", dataTypeClass = Integer.class), 59 @ApiImplicitParam(name = "verticalSpeed", value = "垂直速度", dataTypeClass = Integer.class),
60 @ApiImplicitParam(name = "zoomSpeed", value = "缩放速度", dataTypeClass = Integer.class), 60 @ApiImplicitParam(name = "zoomSpeed", value = "缩放速度", dataTypeClass = Integer.class),