Parcourir la source

Merge branch 'master' into test

yumeng il y a 5 ans
Parent
commit
7271729892

+ 2 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialCutFrameServiceImpl.java

@@ -273,6 +273,7 @@ public class MaterialCutFrameServiceImpl extends ServiceImpl<MaterialCutFrameMap
                 return;
             }
 
+
             JSONArray resultSetArray = respJson.getJSONObject("WorkflowTask").getJSONArray("MediaProcessResultSet");
             if (Check.isNull(resultSetArray)) {
                 return;
@@ -344,7 +345,7 @@ public class MaterialCutFrameServiceImpl extends ServiceImpl<MaterialCutFrameMap
             LoadFileUtil.delFile(coverCutFramePath);
             // 请求从数据接口 获取其余14张截图
             Map<String, Object> coverMap = CloudVideoProcessUtil.videoCutFrameHandle(videoUrl, loadImage);
-            for (int i = 0; i <= 14; i++) {
+            for (int i = 0; i <= 13; i++) {
                 String url = (String) coverMap.get(String.valueOf(i));
                 if (!Check.isNull(url)) {
                     String cutFramePath = LoadFileUtil.downLoadFromUrl(url, imageUpLoadPath);

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/utils/CloudVideoProcessUtil.java

@@ -281,7 +281,7 @@ public class CloudVideoProcessUtil {
 
     private static Map<String, Object> getFrameUrl(String outputPath) {
         Map<String, Object> result = new HashMap<>();
-        for (int i = 0; i < 15; i++) {
+        for (int i = 0; i <= 13; i++) {
             result.put("" + i + "", CosConstant.URL_COS_ADDRESS + outputPath.replace("${Number}", "" + i + ""));
         }
         return result;