From 2db1aa88e8ab53096a936163d686b90d8e056a99 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 23:18:33 +0800
Subject: [PATCH] 国土对接返回信息加密

---
 src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 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 69e88b8..ea2892a 100644
--- a/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
+++ b/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
@@ -18,6 +18,9 @@
 import java.io.File;
 import java.io.IOException;
 
+import static com.dji.sample.speak.util.AudioConverter.convertAudio;
+import static com.dji.sample.speak.util.AudioConverter.convertToFile;
+
 @RestController
 @RequestMapping("${url.speak.prefix}${url.speak.version}")
 public class SpeakVoiceController {
@@ -25,14 +28,16 @@
     private SpeakVoiceService voiceServicel;
     @Autowired
     private PatchesConfigPojo patchesConfigPojo;
+
     @PostMapping("/startVoice")
     public ResponseResult takeVoice(@RequestParam String sn,
                                     @RequestParam int psdk_index,
                                     @RequestParam String name,
                                     @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));
+        File file1 = MultipartFileTOFileUtil.multipartFile2File(file, patchesConfigPojo.getUnzip());
+        File convertFile = convertAudio(file1);
+        return ResponseResult.success(voiceServicel.takeVoice(sn, psdk_index, name, convertFile, volumn));
     }
 
     @PostMapping("/stopVoice")
@@ -51,16 +56,27 @@
     }
 
     @PostMapping("/restartVoice")
-    public ResponseResult restartVoice(@RequestParam int psdkIndex, @RequestParam String sn) {
-        return ResponseResult.success(voiceServicel.restartVoice(sn, psdkIndex));
+    public ResponseResult restartVoice(@RequestParam int psdk_index, @RequestParam String sn) {
+        return ResponseResult.success(voiceServicel.restartVoice(sn, psdk_index));
     }
+
     @PostMapping("/putVoice")
-    public ResponseResult putVoice (int id){
-        return ResponseResult.success(voiceServicel.awayRiver(id));
+    public ResponseResult putVoice(@RequestParam  String sn) {
+        return ResponseResult.success(voiceServicel.awayRiver(sn));
     }
+
     @GetMapping("/selectVoice")
-    public ResponseResult getVoices(@RequestParam Integer page,@RequestParam Integer page_size ){
-    return ResponseResult.success(voiceServicel.getVoices(page,page_size));
+    public ResponseResult getVoices(@RequestParam Integer page, @RequestParam Integer page_size) {
+        return ResponseResult.success(voiceServicel.getVoices(page, page_size));
+    }
+
+    @PostMapping("/startVoices")
+    public ResponseResult takeVoices(
+                                    @RequestParam String sn,
+                                    @RequestParam int psdk_index,
+                                    @RequestParam String name,
+                                    @RequestParam String url) throws UnsupportedAudioFileException, IOException {
+        return ResponseResult.success(voiceServicel.takeVoices(sn, psdk_index, name, url));
     }
 
 }

--
Gitblit v1.9.3