From d81fdeef2ad2f7ecc548cebad6ab15455bf3da27 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 30 Jul 2024 14:53:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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 e642faa..1c3368e 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
@@ -89,17 +89,16 @@
}
@Override
- public int awayRiver(int id) {
- SpeakVoiceEntity voiceEntity=voiceMapper.selectById(id);
+ public int awayRiver(String sn) {
SpeakVoiceStartDto dto = new SpeakVoiceStartDto();
SpeakVoiceFileDto fileDto = new SpeakVoiceFileDto();
- fileDto.setUrl(voiceEntity.getUrl());
- fileDto.setMd5(voiceEntity.getMd5());
+ fileDto.setUrl("https://dev.jxpskj.com:8026/cloud-bucket/00015672-5d68-4985-9340-b23919d7f77e/DJI_202403060918_008_00015672-5d68-4985-9340-b23919d7f77e/qq.wav");
+ fileDto.setMd5("d2b448dcba09071834d02f082dc5386f");
fileDto.setFormat(FormatEnum.PCM);
- fileDto.setName(voiceEntity.getName());
+ fileDto.setName("河道危险");
dto.setPsdk_index(2);
dto.setFile(fileDto);
- return messageSenderService.publishServicesTopic("4TADKCM0010016", VoiceEnums.SPEAKER_AUDIO_PLAY_START.getMethod(), dto).getResult();
+ return messageSenderService.publishServicesTopic(sn, VoiceEnums.SPEAKER_AUDIO_PLAY_START.getMethod(), dto).getResult();
}
@Override
--
Gitblit v1.9.3