diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java index 2c85539f..0c6a88d2 100755 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java @@ -380,62 +380,62 @@ public class CommonChannelController { @RequestMapping(value = "/fi", method = {RequestMethod.GET, RequestMethod.POST}) public void fi(String channelDeviceId, String command, int speed){ - if (logger.isDebugEnabled()) { - logger.debug("通用通道光圈控制和聚焦控制 API调用,channelDeviceId:{} ,command:{} ,speed:{}", channelDeviceId, command, speed); - } - assert !ObjectUtils.isEmpty(channelDeviceId); - - CommonGbChannel channel = commonGbChannelService.getChannel(channelDeviceId); - assert channel != null; - - PTZCommand ptzCommand = new PTZCommand(); - ptzCommand.setzSpeed(zoomSpeed); - ptzCommand.setxSpeed(horizonSpeed); - ptzCommand.setySpeed(verticalSpeed); - switch (command){ - case "left": - ptzCommand.setLeft(true); - break; - case "right": - ptzCommand.setRight(true); - break; - case "up": - ptzCommand.setUp(true); - break; - case "down": - ptzCommand.setDown(true); - break; - case "upleft": - ptzCommand.setUp(true); - ptzCommand.setLeft(true); - break; - case "upright": - ptzCommand.setUp(true); - ptzCommand.setRight(true); - break; - case "downleft": - ptzCommand.setDown(true); - ptzCommand.setLeft(true); - break; - case "downright": - ptzCommand.setDown(true); - ptzCommand.setRight(true); - break; - case "zoomin": - ptzCommand.setIn(true); - break; - case "zoomout": - ptzCommand.setOut(true); - break; - case "stop": - ptzCommand.setzSpeed(0); - ptzCommand.setxSpeed(0); - ptzCommand.setySpeed(0); - break; - default: - break; - } - commonGbChannelService.ptzControl(channel, ptzCommand); +// if (logger.isDebugEnabled()) { +// logger.debug("通用通道光圈控制和聚焦控制 API调用,channelDeviceId:{} ,command:{} ,speed:{}", channelDeviceId, command, speed); +// } +// assert !ObjectUtils.isEmpty(channelDeviceId); +// +// CommonGbChannel channel = commonGbChannelService.getChannel(channelDeviceId); +// assert channel != null; +// +// PTZCommand ptzCommand = new PTZCommand(); +// ptzCommand.setzSpeed(zoomSpeed); +// ptzCommand.setxSpeed(horizonSpeed); +// ptzCommand.setySpeed(verticalSpeed); +// switch (command){ +// case "left": +// ptzCommand.setLeft(true); +// break; +// case "right": +// ptzCommand.setRight(true); +// break; +// case "up": +// ptzCommand.setUp(true); +// break; +// case "down": +// ptzCommand.setDown(true); +// break; +// case "upleft": +// ptzCommand.setUp(true); +// ptzCommand.setLeft(true); +// break; +// case "upright": +// ptzCommand.setUp(true); +// ptzCommand.setRight(true); +// break; +// case "downleft": +// ptzCommand.setDown(true); +// ptzCommand.setLeft(true); +// break; +// case "downright": +// ptzCommand.setDown(true); +// ptzCommand.setRight(true); +// break; +// case "zoomin": +// ptzCommand.setIn(true); +// break; +// case "zoomout": +// ptzCommand.setOut(true); +// break; +// case "stop": +// ptzCommand.setzSpeed(0); +// ptzCommand.setxSpeed(0); +// ptzCommand.setySpeed(0); +// break; +// default: +// break; +// } +// commonGbChannelService.ptzControl(channel, ptzCommand); } // 获取通用通道对应的原始资源信息