Forráskód Böngészése

Merge branch 'test' of https://gitee.com/hcst/adsp-boot into test

# Conflicts:
#	module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java
xuzuoyun 5 éve
szülő
commit
b5831b1b4b

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java

@@ -69,10 +69,10 @@ public class MaterialInfoController {
 
     }
     @PostMapping("watermark")
-    public Result<Object> watermarkVideo(@RequestParam(name = "id")String id,@RequestParam(name = "watermarketTemplateId")Integer watermarketTemplateId){
+    public Result<Object> watermarkVideo(@RequestParam(name = "id")String id,@RequestParam(name = "watermarkTemplateId")Integer watermarkTemplateId){
         Result<Object> result = new Result<>();
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        materialInfoService.watermarkVideo(id,watermarketTemplateId,sysUser.getId());
+        materialInfoService.watermarkVideo(id,watermarkTemplateId,sysUser.getId());
         result.setCode(200);
         result.setSuccess(true);
         result.setMessage("水印合成任务执行成功,请稍后查看");

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/MergeVideoJob.java

@@ -50,6 +50,7 @@ public class MergeVideoJob implements Job {
                         materialInfo.setType("VIDEO");
                         materialInfo.setMaterialName("合成"+ DateUtils.getMillis());
                         materialInfoService.saveOrUpdate(materialInfo);
+                        materialInfoService.getFile(materialInfo);
                         videoMergeTask.setVideoUrl(url);
                         videoMergeTask.setStatus(job.getState());
                         videoMergeTask.setVideoId(materialInfo.getId());

+ 0 - 2
module-common/pom.xml

@@ -23,13 +23,11 @@
     </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>thirtpart</groupId>
             <artifactId>jave</artifactId>
             <version>1.0</version>
         </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>