From 259b893309f8c06a22adc8455f44bcc486d796c7 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 30 Jul 2024 09:30:48 +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..f34049a 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("http://dev.jxpskj.com:9000/cloud-bucket/请远离河道07151604");
+        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