临时提交

结构优化^2
648540858 2024-03-11 18:27:07 +08:00
parent 7db5fabc51
commit 81d95188b2
1 changed files with 56 additions and 56 deletions

View File

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