From e567c76939c6516b4146aa6a554d95c0bcb4f078 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 15 Jul 2024 16:57:50 +0800
Subject: [PATCH] 修改航线文件重命名报错，增加图片缩略图，完善喊话功能
---
src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 5b00357..69e88b8 100644
--- a/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
+++ b/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
@@ -2,6 +2,7 @@
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.component.mqtt.service.IMessageSenderService;
+import com.dji.sample.patches.config.pojo.PatchesConfigPojo;
import com.dji.sample.patches.utils.MultipartFileTOFileUtil;
import com.dji.sample.speak.model.dto.PsdkModelDto;
import com.dji.sample.speak.model.dto.SpeakVoiceStartDto;
@@ -13,21 +14,25 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.sound.sampled.UnsupportedAudioFileException;
import java.io.File;
+import java.io.IOException;
@RestController
@RequestMapping("${url.speak.prefix}${url.speak.version}")
public class SpeakVoiceController {
@Autowired
private SpeakVoiceService voiceServicel;
-
+ @Autowired
+ private PatchesConfigPojo patchesConfigPojo;
@PostMapping("/startVoice")
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));
+ @RequestParam Integer volumn,
+ @RequestParam MultipartFile file) throws UnsupportedAudioFileException, IOException {
+ File file1=MultipartFileTOFileUtil.multipartFile2File(file,patchesConfigPojo.getUnzip());
+ return ResponseResult.success(voiceServicel.takeVoice(sn, psdk_index,name,file1,volumn));
}
@PostMapping("/stopVoice")
@@ -49,4 +54,13 @@
public ResponseResult restartVoice(@RequestParam int psdkIndex, @RequestParam String sn) {
return ResponseResult.success(voiceServicel.restartVoice(sn, psdkIndex));
}
+ @PostMapping("/putVoice")
+ public ResponseResult putVoice (int id){
+ return ResponseResult.success(voiceServicel.awayRiver(id));
+ }
+ @GetMapping("/selectVoice")
+ public ResponseResult getVoices(@RequestParam Integer page,@RequestParam Integer page_size ){
+ return ResponseResult.success(voiceServicel.getVoices(page,page_size));
+ }
+
}
--
Gitblit v1.9.3