From 4b5a7a0ba44c675db1fff37f9552699d4d0942e9 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 30 Jul 2024 14:51:33 +0800
Subject: [PATCH] 增加执行高度模式
---
src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java b/src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java
index 16d2352..4a7a78f 100644
--- a/src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java
+++ b/src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java
@@ -39,27 +39,31 @@
private SpeakVoiceMapper voiceMapper;
@Override
- public int takeVoice(String sn, Integer psdk_index, String name, File file,Integer volumn) throws UnsupportedAudioFileException, IOException {
+ public SpeakVoiceEntity takeVoice(String name, File file) throws UnsupportedAudioFileException, IOException {
SpeakVoiceEntity voiceEntity = new SpeakVoiceEntity();
- SpeakVoiceStartDto dto = new SpeakVoiceStartDto();
- SpeakVoiceFileDto fileDto = new SpeakVoiceFileDto();
- SpeakVolumeDto volumeDto=new SpeakVolumeDto();
- volumeDto.setPsdk_index(psdk_index);
- volumeDto.setPlay_volume(volumn);
String url = upMinio(file, name);
- fileDto.setUrl(url);
String md5 = MD5Util.getMD5Checksum(file);
- fileDto.setMd5(md5);
- fileDto.setFormat(FormatEnum.PCM);
- fileDto.setName(name);
- dto.setPsdk_index(psdk_index);
- dto.setFile(fileDto);
double time = getAudioDuration(file);
voiceEntity.setMd5(md5);
voiceEntity.setSecond(time);
voiceEntity.setUrl(url);
voiceEntity.setName(name);
voiceMapper.insert(voiceEntity);
+ return voiceEntity;
+ }
+ @Override
+ public int takeVoicee(String sn, Integer psdk_index, String name, File file,Integer volumn,SpeakVoiceEntity entity) {
+ SpeakVoiceStartDto dto = new SpeakVoiceStartDto();
+ SpeakVoiceFileDto fileDto = new SpeakVoiceFileDto();
+ SpeakVolumeDto volumeDto=new SpeakVolumeDto();
+ volumeDto.setPsdk_index(psdk_index);
+ volumeDto.setPlay_volume(volumn);
+ fileDto.setUrl(entity.getUrl());
+ fileDto.setMd5(entity.getMd5());
+ fileDto.setFormat(FormatEnum.PCM);
+ fileDto.setName(entity.getName());
+ dto.setPsdk_index(psdk_index);
+ dto.setFile(fileDto);
messageSenderService.publishServicesTopic(sn, VoiceEnums.SPEAKER_PLAY_VOLUME_SET.getMethod(), volumeDto);
return messageSenderService.publishServicesTopic(sn, VoiceEnums.SPEAKER_AUDIO_PLAY_START.getMethod(), dto).getResult();
}
@@ -89,7 +93,7 @@
}
@Override
- public int awayRiver() {
+ public int awayRiver(String sn) {
SpeakVoiceStartDto dto = new SpeakVoiceStartDto();
SpeakVoiceFileDto fileDto = new SpeakVoiceFileDto();
fileDto.setUrl("http://dev.jxpskj.com:9000/cloud-bucket/请远离河道07151604");
@@ -98,9 +102,19 @@
fileDto.setName("河道危险");
dto.setPsdk_index(2);
dto.setFile(fileDto);
- return messageSenderService.publishServicesTopic("7CTDM5E00BR787", VoiceEnums.SPEAKER_AUDIO_PLAY_START.getMethod(), dto).getResult();
+ return messageSenderService.publishServicesTopic(sn, VoiceEnums.SPEAKER_AUDIO_PLAY_START.getMethod(), dto).getResult();
}
-
+ public int awayCar(String sn) {
+ SpeakVoiceStartDto dto = new SpeakVoiceStartDto();
+ SpeakVoiceFileDto fileDto = new SpeakVoiceFileDto();
+ fileDto.setUrl("http://dev.jxpskj.com:9000/cloud-bucket/录音20240730112507301125");
+ fileDto.setMd5("b4e738b1c5c97d4fa52f3918bab3f42d");
+ fileDto.setFormat(FormatEnum.PCM);
+ fileDto.setName("违章停车");
+ dto.setPsdk_index(2);
+ dto.setFile(fileDto);
+ return messageSenderService.publishServicesTopic(sn, VoiceEnums.SPEAKER_AUDIO_PLAY_START.getMethod(), dto).getResult();
+ }
@Override
public PaginationData<SpeakVoiceEntity> getVoices(Integer pages,Integer page_size) {
// Paging Query
--
Gitblit v1.9.3