wangyunpeng 1 dag geleden
bovenliggende
commit
a763879ea7

+ 1 - 1
core/src/main/java/com/tzld/supply/api/fish/FishApiService.java

@@ -6,7 +6,7 @@ public interface FishApiService {
 
     void importTTSModels(String speakerId);
 
-    String tts(String speakerId, String text, Double speed, String bizId);
+    String tts(String speakerId, String text, String bizId);
 
     String ttsByAudio(byte[] referenceAudio, String referenceText, String text, String bizId);
 

+ 1 - 2
core/src/main/java/com/tzld/supply/api/fish/FishApiServiceImpl.java

@@ -176,7 +176,7 @@ public class FishApiServiceImpl implements FishApiService {
     }
 
     @Override
-    public String tts(String speakerId, String text, Double speed, String bizId) {
+    public String tts(String speakerId, String text, String bizId) {
         // 先从缓存中拿
         String textMd5 = Md5Util.encoderByMd5(text);
         String ttsUrl = getCacheTtsUrl(speakerId, textMd5);
@@ -189,7 +189,6 @@ public class FishApiServiceImpl implements FishApiService {
         Map<String, String> paramMap = new HashMap<>();
         paramMap.put("reference_id", speakerId);
         paramMap.put("text", text);
-        paramMap.put("speed", String.valueOf(speed));
 
         boolean enableRetry = false;
         // retry 3 times

+ 1 - 1
core/src/main/java/com/tzld/supply/job/VideoGenerateJob.java

@@ -108,7 +108,7 @@ public class VideoGenerateJob {
             // 随机选择一个模型
             AiModelTts tts = ttsList.get(new Random().nextInt(ttsList.size()));
             String audioId = DistributedIdGenerator.generate();
-            String voiceUrl = fishApiService.tts(tts.getSpeakerId(), content.getPqImproveNarrationScript(), 1.0, audioId);
+            String voiceUrl = fishApiService.tts(tts.getSpeakerId(), content.getPqImproveNarrationScript(), audioId);
             if (StringUtils.isBlank(voiceUrl)) {
                 log.error("生成语音失败,contentId: {}", content.getId());
                 continue;

+ 29 - 13
server/src/test/java/ProduceTest.java

@@ -21,6 +21,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.util.Arrays;
 import java.util.List;
 
 @SpringBootTest(classes = Application.class)
@@ -46,20 +47,35 @@ public class ProduceTest {
 
     @Test
     public void test() {
-        String contentId = "26177";
-        contentMediaSearchJob.contentImageMediaSearchJob(contentId);
-        contentMediaSearchJob.contentMediaImageCheckJob(contentId);
-        contentMediaSearchJob.contentVideoMediaSearchJob(contentId);
-        videoGenerateJob.videoVoiceGenerateJob(contentId);
-        ProduceVideoExample example = new ProduceVideoExample();
-        example.createCriteria().andContentIdEqualTo(Long.valueOf(contentId));
-        List<ProduceVideo> produceVideoList = produceVideoMapper.selectByExample(example);
-        if (produceVideoList.isEmpty()) {
-            return;
+        List<String> contentIds = Arrays.asList("33619",
+                "33616",
+                "33614",
+                "33613",
+                "33611",
+                "33610",
+                "33606",
+                "33605",
+                "33598",
+                "33594",
+                "33593",
+                "33585",
+                "33577",
+                "33574");
+        for (String contentId : contentIds) {
+            contentMediaSearchJob.contentImageMediaSearchJob(contentId);
+            contentMediaSearchJob.contentMediaImageCheckJob(contentId);
+            contentMediaSearchJob.contentVideoMediaSearchJob(contentId);
+            videoGenerateJob.videoVoiceGenerateJob(contentId);
+            ProduceVideoExample example = new ProduceVideoExample();
+            example.createCriteria().andContentIdEqualTo(Long.valueOf(contentId));
+            List<ProduceVideo> produceVideoList = produceVideoMapper.selectByExample(example);
+            if (produceVideoList.isEmpty()) {
+                return;
+            }
+            ProduceVideo produceVideo = produceVideoList.get(0);
+            videoGenerateJob.videoMaterialGenerateJob(produceVideo.getId());
+            videoGenerateJob.videoGenerateJob(produceVideo.getId());
         }
-        ProduceVideo produceVideo = produceVideoList.get(0);
-        videoGenerateJob.videoMaterialGenerateJob(produceVideo.getId());
-        videoGenerateJob.videoGenerateJob(produceVideo.getId());
     }
 
     @Test