From 018869ba335c8fe7a50791062c1a4543e5389982 Mon Sep 17 00:00:00 2001 From: twy <2301620162@qq.com> Date: Mon, 24 Jul 2023 14:27:22 +0800 Subject: [PATCH] 2subtitle --- .../sm/impl/PhotoSpeakVideoServiceImpl.java | 111 ++++++++++++------ 1 file changed, 73 insertions(+), 38 deletions(-) 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 0e325f3..a172a57 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 @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.google.gson.JsonObject; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; @@ -18,6 +19,7 @@ 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; @@ -218,46 +220,79 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { Integer voiceFrom = photoSpeakVideo.getVoiceFrom(); String voiceMaterialUrl = photoSpeakVideo.getVoiceMaterialUrl(); - 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]); - } + 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"))); + reSubtitle.put("enabled",1); + reSubtitle.put("text",photoSpeakVideo.getPaperwork()); + reSubtitle.put("params",params); + param.setSubtitle_params(reSubtitle); - 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); - } } +// 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, "[*]"));