Jelajahi Sumber

Merge remote-tracking branch 'origin/test' into test

syh 5 tahun lalu
induk
melakukan
5d00a73ee2

+ 1 - 3
jeecg-boot-module-system/src/main/resources/application-test.yml

@@ -164,10 +164,8 @@ logging:
 chrome:
   script:
     clean: sh /mnt/webapp/cleanProcess.sh
-
-
 oss:
   replace:
-    replace-value: oss-cn-beijing-internal
+    replace-value: oss-cn-beijing
     replace-old-value: oss-cn-beijing
     download: /mnt/file/video/

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

@@ -116,10 +116,14 @@ public class MaterialCutFrameServiceImpl extends ServiceImpl<MaterialCutFrameMap
 
             snapshotConfig.put("OutputFile", output.toJSONString());
             // SnapshotConfig->Time
-            Integer time = ((secondDuration.intValue() - 2) / 14); // 时长 / 14 == 间隔时间
+            //   Integer time = ((secondDuration.intValue() - 2) / 14) + 1; // 时长 / 14 == 间隔时间
+
+            double num = (double) secondDuration / 13;
+            long rint = Math.round(num);
+            log.info("相隔时间数:{}", rint);
             snapshotConfig.put("Time", 2000);
             // SnapshotConfig->Interval/Num
-            snapshotConfig.put("Interval", time);
+            snapshotConfig.put("Interval", rint);
             snapshotConfig.put("Num", "14");
             // SnapshotConfig->Width/Height
             snapshotConfig.put("Height", height);