Merge remote-tracking branch 'origin/ht-dev' into ht-dev

aix

2024-07-30 249d316e0b8c79b71b779b5716bc488e1d08a9b3

 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;
@@ -33,7 +34,8 @@
                                    @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));
        SpeakVoiceEntity entity=voiceServicel.takeVoice(name, file1);
        return ResponseResult.success(voiceServicel.takeVoicee(sn, psdk_index, name, file1, volumn,entity));
    }

    @PostMapping("/stopVoice")
@@ -57,12 +59,18 @@
    }

    @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));
    }

    @PostMapping("/putVoice2")
    public ResponseResult putVoices(@RequestParam  String sn) {
        return ResponseResult.success(voiceServicel.awayCar(sn));
    }

}