From 638408723ebbf884f59ecaafcaab1c29f69bc689 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 15 Jul 2024 16:58:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 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..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,45 +2,65 @@
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;
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 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(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 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")
- 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));
}
+ @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