From c719838525c874e1527b6ee137a163f044ba4a80 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 11 Jul 2024 20:42:26 +0800
Subject: [PATCH] 新增喊话模块，更新shp文件入库，对图片返回做去重处理
---
src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java b/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
index 5d03436..5b00357 100644
--- a/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
+++ b/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
@@ -2,15 +2,16 @@
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.component.mqtt.service.IMessageSenderService;
+import com.dji.sample.patches.utils.MultipartFileTOFileUtil;
import com.dji.sample.speak.model.dto.PsdkModelDto;
import com.dji.sample.speak.model.dto.SpeakVoiceStartDto;
import com.dji.sample.speak.model.dto.SpeakVolumeDto;
+import com.dji.sample.speak.model.enums.FormatEnum;
import com.dji.sample.speak.model.param.SpeakVoiceStartParam;
import com.dji.sample.speak.service.SpeakVoiceService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.File;
@@ -21,26 +22,31 @@
private SpeakVoiceService voiceServicel;
@PostMapping("/startVoice")
- public ResponseResult takeVoice(String sn , SpeakVoiceStartParam param) {
- return ResponseResult.success(voiceServicel.takeVoice(sn,param));
+ public ResponseResult takeVoice(@RequestParam String sn,
+ @RequestParam int psdk_index,
+ @RequestParam String name,
+ @RequestParam MultipartFile file) {
+ File file1=MultipartFileTOFileUtil.multipartFile2File(file,"src/main/resources/tmp/20240614");
+ return ResponseResult.success(voiceServicel.takeVoice(sn, psdk_index,name,file1));
}
@PostMapping("/stopVoice")
- public ResponseResult stopVoice() {
- return ResponseResult.success(voiceServicel.stopVoice());
+ public ResponseResult stopVoice(@RequestParam int psdk_index, @RequestParam String sn) {
+ return ResponseResult.success(voiceServicel.stopVoice(sn, psdk_index));
}
@PostMapping("/voiceVolumn")
- public ResponseResult voiceVolumn(SpeakVolumeDto dto) {
- return ResponseResult.success(voiceServicel.setVoiceVolume(dto));
+ public ResponseResult voiceVolumn(@RequestBody SpeakVolumeDto dto, @RequestParam String sn) {
+ return ResponseResult.success(voiceServicel.setVoiceVolume(dto, sn));
}
@PostMapping("/voiceMode")
- public ResponseResult restartVoice(PsdkModelDto dto) {
- return ResponseResult.success(voiceServicel.setVoiceMode(dto));
+ public ResponseResult restartVoice(@RequestBody PsdkModelDto dto, @RequestParam String sn) {
+ return ResponseResult.success(voiceServicel.setVoiceMode(sn, dto));
}
+
@PostMapping("/restartVoice")
- public ResponseResult restartVoice() {
- return ResponseResult.success(voiceServicel.restartVoice());
+ public ResponseResult restartVoice(@RequestParam int psdkIndex, @RequestParam String sn) {
+ return ResponseResult.success(voiceServicel.restartVoice(sn, psdkIndex));
}
}
--
Gitblit v1.9.3