|
@@ -33,8 +33,6 @@ import java.util.concurrent.ExecutorService;
|
|
|
import java.util.concurrent.Executors;
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
|
-// import it.sauronsoftware.jave.Encoder;
|
|
|
-
|
|
|
/**
|
|
|
* 素材信息
|
|
|
*
|
|
@@ -50,13 +48,14 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
private IVideoWatermarkTemplateService videoWatermarkTemplateService;
|
|
|
@Autowired
|
|
|
private IVideoWatermarkTaskService videoWatermarkTaskService;
|
|
|
-
|
|
|
@Override
|
|
|
- public void watermarkVideo(String materialId, Integer videoWatermarkTemplateId, String userId) {
|
|
|
+ public void watermarkVideo(String materialId,Integer videoWatermarkTemplateId,String userId){
|
|
|
VideoWatermarkTemplate videoWatermarkTemplate = videoWatermarkTemplateService.getById(videoWatermarkTemplateId);
|
|
|
MaterialInfo materialInfo = this.getById(materialId);
|
|
|
MpsUtils mpsUtils = new MpsUtils();
|
|
|
- String jobId = mpsUtils.videoWaterMark(materialInfo.getUrl(), videoWatermarkTemplate.getTemplatePath(), videoWatermarkTemplate.getTemplateId(), videoWatermarkTemplate.getHeight());
|
|
|
+ String path = materialInfo.getUrl().substring(materialInfo.getUrl().indexOf("/",10)+1,materialInfo.getUrl().length());
|
|
|
+ System.out.println(path);
|
|
|
+ String jobId = mpsUtils.videoWaterMark(path,videoWatermarkTemplate.getTemplatePath(),videoWatermarkTemplate.getTemplateId(),videoWatermarkTemplate.getHeight());
|
|
|
QueryJobListResponse.Job job = mpsUtils.getJobStatus(jobId);
|
|
|
VideoWatermarkTask videoWatermarkTask = new VideoWatermarkTask();
|
|
|
videoWatermarkTask.setJobId(jobId);
|
|
@@ -323,6 +322,8 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
});
|
|
|
}
|
|
|
|