From d2d88ecb5fd7407b768a314fb0f88d49c40abbe8 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 30 Jul 2024 19:24:13 +0800
Subject: [PATCH] Merge branch 'ht-dev' of http://139.196.74.78:10010/r/drone/drone-java into ht-dev
---
src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java | 58 ++++++++++++++++++++++------------------------------------
1 files changed, 22 insertions(+), 36 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 4a7a78f..ca12a9b 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,31 +39,27 @@
private SpeakVoiceMapper voiceMapper;
@Override
- public SpeakVoiceEntity takeVoice(String name, File file) throws UnsupportedAudioFileException, IOException {
+ public int takeVoice(String sn, Integer psdk_index, String name, File file,Integer volumn) throws UnsupportedAudioFileException, IOException {
SpeakVoiceEntity voiceEntity = new SpeakVoiceEntity();
- String url = upMinio(file, name);
- String md5 = MD5Util.getMD5Checksum(file);
- 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());
+ String url = upMinio(file, name);
+ fileDto.setUrl(url);
+ String md5 = MD5Util.getMD5Checksum(file);
+ fileDto.setMd5(md5);
fileDto.setFormat(FormatEnum.PCM);
- fileDto.setName(entity.getName());
+ 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);
messageSenderService.publishServicesTopic(sn, VoiceEnums.SPEAKER_PLAY_VOLUME_SET.getMethod(), volumeDto);
return messageSenderService.publishServicesTopic(sn, VoiceEnums.SPEAKER_AUDIO_PLAY_START.getMethod(), dto).getResult();
}
@@ -104,17 +100,7 @@
dto.setFile(fileDto);
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
@@ -135,7 +121,7 @@
String accessKey = pojo.getAccessKey();
String secretKey = pojo.getSecretKey();
String bucketName = pojo.getBucket();
- String objectName = "/" + fileName + getNowTimeName();
+ String objectName = "/" + fileName + getNowTimeName()+"pcm";
FileServiceImpl.uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, file, "audio/mpeg");
return endpoint + "/" + bucketName + objectName;
}
@@ -146,12 +132,12 @@
return currentTime.format(DateTimeFormatter.ofPattern("MMddHHmm"));
}
- public static double getAudioDuration(File file) throws UnsupportedAudioFileException, IOException {
- AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(file);
- AudioFormat format = audioInputStream.getFormat();
- long audioFileLength = file.length();
- int frameSize = format.getFrameSize();
- float frameRate = format.getFrameRate();
- return Math.round(audioFileLength / (frameSize * frameRate));
- }
+// public static double getAudioDuration(File file) throws UnsupportedAudioFileException, IOException {
+// AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(file);
+// AudioFormat format = audioInputStream.getFormat();
+// long audioFileLength = file.length();
+// int frameSize = format.getFrameSize();
+// float frameRate = format.getFrameRate();
+// return Math.round(audioFileLength / (frameSize * frameRate));
+// }
}
--
Gitblit v1.9.3