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/UavCameraController.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/ard-admin/src/main/java/com/ard/web/controller/work/UavCameraController.java b/ard-admin/src/main/java/com/ard/web/controller/work/UavCameraController.java
index 4562849..b47b862 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/work/UavCameraController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/work/UavCameraController.java
@@ -24,6 +24,13 @@
     @Resource
     private ITyService tyService;
 
+    @ApiOperation(value = "设置相机模式", notes = "actionParam值:1-拍照,2-录像")
+    @ApiOperationSupport(order = 1)
+    @PostMapping("/updateCameraMode")
+    public AjaxResult updateCameraMode(@RequestBody CameraModeDTO cameraModeDTO) {
+        tyService.updateCameraMode(cameraModeDTO);
+        return AjaxResult.success();
+    }
 
     @ApiOperation("拍照")
     @ApiOperationSupport(order = 1)
@@ -73,6 +80,15 @@
         return AjaxResult.success();
     }
 
+    @ApiOperation("格式化存储卡")
+    @ApiOperationSupport(order = 9)
+    @PostMapping("/formatSdCard")
+    public AjaxResult formatSdCard(@RequestBody FormatSdCardDTO formatSdCardDTO) {
+        tyService.formatSdCard(formatSdCardDTO);
+        return AjaxResult.success();
+    }
+
+
     @ApiOperation(value = "打开或关闭照片回传", notes = "actionParam值:0-关闭,1-打开")
     @ApiOperationSupport(order = 10)
     @PostMapping("/photoReturnToggle")
@@ -81,4 +97,6 @@
         return AjaxResult.success();
     }
 
+
+
 }
\ No newline at end of file

--
Gitblit v1.9.3