From e066b29fa02f76741c8ec35864f1f1add9c12e93 Mon Sep 17 00:00:00 2001 From: sdy Date: Thu, 4 Jun 2026 19:37:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=95=9C=E5=A4=B4=E6=A8=A1=E5=BC=8F=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E4=BC=98=E5=8C=96=202.=E7=9B=B8=E6=9C=BA=E5=AF=B9?= =?UTF-8?q?=E7=84=A6=E6=A8=A1=E5=BC=8F=E8=AE=BE=E7=BD=AE=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BC=98=E5=8C=96=203.=E7=9B=B8=E6=9C=BA=E6=9B=9D=E5=85=89?= =?UTF-8?q?=E5=80=BC=E8=B0=83=E8=8A=82=E5=8F=82=E6=95=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/business/controller/CameraController.java | 4 ++-- .../modules/business/dto/camera/FocalLengthSet.java | 9 ++++++++- .../modules/business/service/CameraService.java | 2 +- .../modules/business/service/impl/CameraServiceImpl.java | 2 +- .../modules/business/service/impl/LiveServiceImpl.java | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/admin/src/main/java/com/multictrl/modules/business/controller/CameraController.java b/admin/src/main/java/com/multictrl/modules/business/controller/CameraController.java index 2c82458..16b0524 100644 --- a/admin/src/main/java/com/multictrl/modules/business/controller/CameraController.java +++ b/admin/src/main/java/com/multictrl/modules/business/controller/CameraController.java @@ -165,7 +165,7 @@ public class CameraController { @Parameter(name = "value", description = "曝光值 1:-5.0EV 2:-4.7EV 3:-4.3EV 4:-4.0EV " + "5:-3.7EV 6:-3.3EV 7:-3.0EV 8:-2.7EV 9:-2.3EV 10:-2.0EV 11:-1.7EV 12:-1.3EV " + "13:-1.0EV ...查看接口(获取相机曝光值)") - @RequestParam String value) { + @RequestParam Integer value) { return new Result<>().ok(cameraService.exposureSet(dockSn, value)); } @@ -175,7 +175,7 @@ public class CameraController { @Operation(summary = "相机对焦模式设置", description = "注意: Matrice 30 系列飞行器只支持 zoom 镜头下配置该参数") @RequiresPermissions("bus:camera:focusModeSet") public Result focusModeSet(@PathVariable("dockSn") String dockSn, - @Parameter(name = "mode", description = "对焦模式 1:MF 2:AFS 3:AFC") + @Parameter(name = "mode", description = "对焦模式 0:MF 1:AFS 2:AFC") @RequestParam Integer mode) { return new Result<>().ok(cameraService.focusModeSet(dockSn, mode)); diff --git a/admin/src/main/java/com/multictrl/modules/business/dto/camera/FocalLengthSet.java b/admin/src/main/java/com/multictrl/modules/business/dto/camera/FocalLengthSet.java index 94de602..c744d72 100644 --- a/admin/src/main/java/com/multictrl/modules/business/dto/camera/FocalLengthSet.java +++ b/admin/src/main/java/com/multictrl/modules/business/dto/camera/FocalLengthSet.java @@ -16,13 +16,20 @@ import lombok.Data; @Schema(name = "变焦参数") public class FocalLengthSet { // @NotBlank(message = "相机模式不能为空") - @Schema(description = "相机模式 ir:红外 wide:广角 zoom:变焦", hidden = true) + @Schema(description = "相机模式 ir:红外 zoom:变焦", hidden = true) private String cameraType; @NotNull(message = "变焦倍数不能为空") @Schema(description = "变焦倍数，可见光是2-200，红外是2-20") private Double zoomFactor; + @JsonIgnore + @Schema(hidden = true) + @AssertTrue(message = "相机模式设当前为广角，无法变焦") + public boolean isCameraTypeValid() { + return !cameraType.equals("wide"); + } + @JsonIgnore @Schema(hidden = true) @AssertTrue(message = "变焦倍数设置错误") diff --git a/admin/src/main/java/com/multictrl/modules/business/service/CameraService.java b/admin/src/main/java/com/multictrl/modules/business/service/CameraService.java index 82c5d84..08e7f70 100644 --- a/admin/src/main/java/com/multictrl/modules/business/service/CameraService.java +++ b/admin/src/main/java/com/multictrl/modules/business/service/CameraService.java @@ -47,7 +47,7 @@ public interface CameraService { String exposureModeSet(String dockSn, Integer mode); //相机曝光值调节 - String exposureSet(String dockSn, String value); + String exposureSet(String dockSn, Integer value); //相机对焦模式设置 String focusModeSet(String dockSn, Integer mode); diff --git a/admin/src/main/java/com/multictrl/modules/business/service/impl/CameraServiceImpl.java b/admin/src/main/java/com/multictrl/modules/business/service/impl/CameraServiceImpl.java index 035b305..910f946 100644 --- a/admin/src/main/java/com/multictrl/modules/business/service/impl/CameraServiceImpl.java +++ b/admin/src/main/java/com/multictrl/modules/business/service/impl/CameraServiceImpl.java @@ -135,7 +135,7 @@ public class CameraServiceImpl implements CameraService { } @Override - public String exposureSet(String dockSn, String value) { + public String exposureSet(String dockSn, Integer value) { JSONObject data = getDataIncludePayloadIndex(dockSn); Object videoType = CacheUtils.get(BusinessConstant.UAV_VIDEO_TYPE + dockSn); data.set("camera_type", Objects.requireNonNullElse(videoType, "wide")); diff --git a/admin/src/main/java/com/multictrl/modules/business/service/impl/LiveServiceImpl.java b/admin/src/main/java/com/multictrl/modules/business/service/impl/LiveServiceImpl.java index 501ffc0..b693399 100644 --- a/admin/src/main/java/com/multictrl/modules/business/service/impl/LiveServiceImpl.java +++ b/admin/src/main/java/com/multictrl/modules/business/service/impl/LiveServiceImpl.java @@ -73,7 +73,7 @@ public class LiveServiceImpl implements LiveService { JSONObject data = new JSONObject(); data.set("video_type", videoType); String result = djiBaseService.executeAndReturnResult(dockSn, "live_lens_change", data); - CacheUtils.set(BusinessConstant.UAV_VIDEO_TYPE, videoType); + CacheUtils.set(BusinessConstant.UAV_VIDEO_TYPE + dockSn, videoType); return result; }