Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

临时提交

结构优化^2
648540858 2024-03-11 18:27:07 +08:00
parent 7db5fabc51
commit 81d95188b2
1 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java
View File

@ -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);
}
// 获取通用通道对应的原始资源信息