From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/work/UavGimbalController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/work/UavGimbalController.java b/ard-admin/src/main/java/com/ard/web/controller/work/UavGimbalController.java
index aad82b9..18e83e8 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/work/UavGimbalController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/work/UavGimbalController.java
@@ -4,12 +4,16 @@
import com.ard.work.domain.dto.control.AbsAngleControlDTO;
import com.ard.work.domain.dto.control.AngleControlDTO;
import com.ard.work.domain.dto.control.SpeedControlDTO;
+import com.ard.work.service.IGimbalSpeedService;
import com.ard.work.service.ITyService;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@@ -26,9 +30,12 @@
@Resource
private ITyService tyService;
+ @Resource
+ private IGimbalSpeedService gimbalSpeedService;
- @ApiOperation(value = "云台转动(基于角度)", notes = "actionCode值：0-回中,1-上,2-右上,3-右,4-右下,5-下,6-左下,7-左,8-左上,254-停止 \r\n rotationAngle值：取值范围:0~255【云台实际转动角度= 转动角度/100+2.5 单位：度】")
+ @ApiOperation(value = "云台转动(基于角度)", notes = "actionCode值：0-回中,1-上,2-右上,3-右,4-右下,5-下,6-左下,7-左,8-左上,254-停止 \r\n " +
+ "rotationAngle值：取值范围:0~255【云台实际转动角度= 转动角度/100+2.5 单位：度】")
@ApiOperationSupport(order = 1)
@PostMapping("/angleControl")
public AjaxResult angleControl(@RequestBody AngleControlDTO angleControlDto) {
@@ -52,4 +59,15 @@
return AjaxResult.success();
}
+ @ApiOperation(value = "云台速度控制(开始/停止统一接口)")
+ @ApiOperationSupport(order = 4)
+ @PostMapping("/speedControlSimple")
+ public AjaxResult speedControlSimple(@RequestBody @Validated SpeedControlDTO speedControlDto) {
+ if (speedControlDto.isStart()) {
+ gimbalSpeedService.startControl(speedControlDto);
+ } else {
+ gimbalSpeedService.stopControl(speedControlDto.getBoxSn());
+ }
+ return AjaxResult.success();
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3