From 60f6ff9068d50f796eeee924a0d31b64be4dc306 Mon Sep 17 00:00:00 2001 From: twy <2301620162@qq.com> Date: Wed, 26 Jul 2023 18:20:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=85=A7=E6=92=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PhotoSpeakVideoController.java | 1 - .../sm/impl/PhotoSpeakVideoServiceImpl.java | 80 +------------------ .../com/iformall/sm/AiPhotoSpeakParam.java | 9 --- 3 files changed, 4 insertions(+), 86 deletions(-) diff --git a/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java b/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java index 944befd..e7e0400 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java @@ -1,6 +1,5 @@ package com.iformall.controller; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.iformall.annotation.AuthIgnore; diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java index fdf259f..3424d70 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java @@ -19,7 +19,6 @@ import com.iformall.utils.Base64Util; import com.iformall.utils.DateUtils; import com.iformall.video.VideoFactory; import com.iformall.video.entity.VideUploadResult; -import jdk.nashorn.internal.ir.annotations.Ignore; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +33,10 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import javax.transaction.xa.XAException; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; @@ -220,80 +222,6 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { Integer voiceFrom = photoSpeakVideo.getVoiceFrom(); String voiceMaterialUrl = photoSpeakVideo.getVoiceMaterialUrl(); -// if (photoSpeakVideo.getSubtitleEnabled()==1){ -//// //开启字幕 查询字幕列表 -// Map reSubtitle = new HashMap(); -// Map params = new HashMap(); -// JSONObject subtitle = JSON.parseObject(photoSpeakVideo.getSubtitleParams()); -// params.put("Fontname",(subtitle.get("Fontname")==null?"宋体":subtitle.get("Fontname"))); -// params.put("Fontsize",(subtitle.get("Fontsize")==null? 25:subtitle.get("Fontsize"))); -// params.put("PrimaryColour",(subtitle.get("PrimaryColour")==null?"&Hffffff":subtitle.get("PrimaryColour"))); -// params.put("SecondaryColour",(subtitle.get("SecondaryColour")==null?"BBGGRR":subtitle.get("SecondaryColour"))); -// params.put("OutlineColour",(subtitle.get("OutlineColour")==null?"BBGGRR":subtitle.get("OutlineColour"))); -// params.put("BackColour",(subtitle.get("BackColour")==null?"&H0000ff":subtitle.get("BackColour"))); -// params.put("Bold",(subtitle.get("Bold")==null? -1:subtitle.get("Bold"))); -// params.put("Italic",(subtitle.get("Italic")==null? 0:subtitle.get("Italic"))); -// params.put("Underline",(subtitle.get("Underline")==null? 0:subtitle.get("Underline"))); -// params.put("Strikeout",(subtitle.get("Strikeout")==null? 0:subtitle.get("Strikeout"))); -// params.put("ScaleX",(subtitle.get("ScaleX")==null? 100:subtitle.get("ScaleX"))); -// params.put("ScaleY",(subtitle.get("ScaleY")==null? 100:subtitle.get("ScaleY"))); -// params.put("Spacing",(subtitle.get("Spacing")==null? 0:subtitle.get("Spacing"))); -// params.put("Angle",(subtitle.get("Angle")==null? 15:subtitle.get("Angle"))); -// params.put("BorderStyle",(subtitle.get("BorderStyle")==null?"1":subtitle.get("BorderStyle"))); -// params.put("Outline",(subtitle.get("Outline")==null? 20:subtitle.get("Outline"))); -// params.put("Shadow",(subtitle.get("Shadow")==null? 12:subtitle.get("Shadow"))); -// params.put("Alignment",(subtitle.get("Alignment")==null? 1:subtitle.get("Alignment"))); -// params.put("MarginL",(subtitle.get("MarginL")==null? 100:subtitle.get("MarginL"))); -// params.put("MarginR",(subtitle.get("MarginR")==null? 100:subtitle.get("MarginR"))); -// params.put("MarginV",(subtitle.get("MarginV")==null? 100:subtitle.get("MarginV"))); -// subtitle.put("enabled",1); -// subtitle.put("text",photoSpeakVideo.getPaperwork()); -// subtitle.put("params",params); -// param.setSubtitle_params(subtitle); -// -// } -// List videoMapperList = photoSpeakVideoMapper.findList(speakVideoUpd); -// for (PhotoSpeakVideo speakVideo : videoMapperList) { -// if (speakVideo.getSubtitleEnabled()==1){ -//// 开启字幕 查询字幕列表 -// String[] getparams = speakVideo.getSubtitleParams().split(","); -// Map subtitle = new HashMap(); -// Map params = new HashMap(); -// Map map = new HashMap(); -// for (String s : getparams) { -// String[] kv = s.split(":"); -// map.put(kv[0],kv[1]); -// } -// -// params.put("Fontname",(map.get("Fontname")==null?"宋体":map.get("Fontname"))); -// params.put("Fontsize",(map.get("Fontsize")==null? 25:map.get("Fontsize"))); -// params.put("PrimaryColour",(map.get("PrimaryColour")==null?"&Hffffff":map.get("PrimaryColour"))); -// params.put("SecondaryColour",(map.get("SecondaryColour")==null?"BBGGRR":map.get("SecondaryColour"))); -// params.put("OutlineColour",(map.get("OutlineColour")==null?"BBGGRR":map.get("OutlineColour"))); -// params.put("BackColour",(map.get("BackColour")==null?"&H0000ff":map.get("BackColour"))); -// params.put("Bold",(map.get("Bold")==null? -1:map.get("Bold"))); -// params.put("Italic",(map.get("Italic")==null? 0:map.get("Italic"))); -// params.put("Underline",(map.get("Underline")==null? 0:map.get("Underline"))); -// params.put("Strikeout",(map.get("Strikeout")==null? 0:map.get("Strikeout"))); -// params.put("ScaleX",(map.get("ScaleX")==null? 100:map.get("ScaleX"))); -// params.put("ScaleY",(map.get("ScaleY")==null? 100:map.get("ScaleY"))); -// params.put("Spacing",(map.get("Spacing")==null? 0:map.get("Spacing"))); -// params.put("Angle",(map.get("Angle")==null? 15:map.get("Angle"))); -// params.put("BorderStyle",(map.get("BorderStyle")==null?"1":map.get("BorderStyle"))); -// params.put("Outline",(map.get("Outline")==null? 20:map.get("Outline"))); -// params.put("Shadow",(map.get("Shadow")==null? 12:map.get("Shadow"))); -// params.put("Alignment",(map.get("Alignment")==null? 1:map.get("Alignment"))); -// params.put("MarginL",(map.get("MarginL")==null? 100:map.get("MarginL"))); -// params.put("MarginR",(map.get("MarginR")==null? 100:map.get("MarginR"))); -// params.put("MarginV",(map.get("MarginV")==null? 100:map.get("MarginV"))); -// subtitle.put("enabled",1); -// subtitle.put("text",speakVideo.getPaperwork()); -// subtitle.put("params",params); -// param.setSubtitle_params(subtitle); -// } -// } - - if (EnumVoiceFrom.FROM_MOULD.getCode().equals(voiceFrom)) { param.setGen_txt(photoSpeakVideo.getPaperwork().replaceAll(str, "[*]")); if (sex == 1){ diff --git a/suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakParam.java b/suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakParam.java index e1adbb4..eb64056 100644 --- a/suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakParam.java +++ b/suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakParam.java @@ -3,9 +3,6 @@ package com.iformall.sm; import io.swagger.models.auth.In; import lombok.Data; -import java.util.HashMap; -import java.util.Map; - @Data public class AiPhotoSpeakParam { @@ -18,7 +15,6 @@ public class AiPhotoSpeakParam { * | gender | 是 | string | 说话人性别,male或者female | * | url | 是 | string | 如果上传音频就传url,否则为None | * | img | 是 | base64 | 编码后的图片 | - * | subtitle_params | 否 | base64 | 字幕信息 | */ private String gen_txt; @@ -30,8 +26,6 @@ public class AiPhotoSpeakParam { private Long task_id; private String callback_url; - - public String neglectImgString() { StringBuffer str = new StringBuffer(); str.append("{"); @@ -43,9 +37,6 @@ public class AiPhotoSpeakParam { str.append("\"img\":").append("\"").append(img); str.append("\"task_id\":").append("\"").append(task_id); str.append("\"callback_url\":").append("\"").append(callback_url).append("\"}"); - return str.toString(); } - - }