From 249d316e0b8c79b71b779b5716bc488e1d08a9b3 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 30 Jul 2024 14:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java | 26 ++++++++++++++++++--------
1 files changed, 18 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..4db2966 100644
--- a/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
+++ b/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
@@ -7,6 +7,7 @@
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;
@@ -25,14 +26,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());
+ SpeakVoiceEntity entity=voiceServicel.takeVoice(name, file1);
+ return ResponseResult.success(voiceServicel.takeVoicee(sn, psdk_index, name, file1, volumn,entity));
}
@PostMapping("/stopVoice")
@@ -51,16 +54,23 @@
}
@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("/putVoice2")
+ public ResponseResult putVoices(@RequestParam String sn) {
+ return ResponseResult.success(voiceServicel.awayCar(sn));
}
}
--
Gitblit v1.9.3