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 | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 4db2966..ea2892a 100644
--- a/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
+++ b/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
@@ -7,7 +7,6 @@
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.entity.SpeakVoiceEntity;
import com.dji.sample.speak.model.enums.FormatEnum;
import com.dji.sample.speak.model.param.SpeakVoiceStartParam;
import com.dji.sample.speak.service.SpeakVoiceService;
@@ -18,6 +17,9 @@
import javax.sound.sampled.UnsupportedAudioFileException;
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}")
@@ -34,8 +36,8 @@
@RequestParam Integer volumn,
@RequestParam MultipartFile file) throws UnsupportedAudioFileException, IOException {
File file1 = MultipartFileTOFileUtil.multipartFile2File(file, patchesConfigPojo.getUnzip());
- SpeakVoiceEntity entity=voiceServicel.takeVoice(name, file1);
- return ResponseResult.success(voiceServicel.takeVoicee(sn, psdk_index, name, file1, volumn,entity));
+ File convertFile = convertAudio(file1);
+ return ResponseResult.success(voiceServicel.takeVoice(sn, psdk_index, name, convertFile, volumn));
}
@PostMapping("/stopVoice")
@@ -68,9 +70,13 @@
return ResponseResult.success(voiceServicel.getVoices(page, page_size));
}
- @PostMapping("/putVoice2")
- public ResponseResult putVoices(@RequestParam String sn) {
- return ResponseResult.success(voiceServicel.awayCar(sn));
+ @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