|
@@ -15,7 +15,6 @@ import org.quartz.JobExecutionContext;
|
|
|
import org.quartz.JobExecutionException;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
-import java.io.IOException;
|
|
|
import java.util.List;
|
|
|
|
|
|
public class MergeVideoJob implements Job {
|
|
@@ -50,12 +49,13 @@ public class MergeVideoJob implements Job {
|
|
|
materialInfo.setType("VIDEO");
|
|
|
materialInfo.setMaterialName("合成" + DateUtils.getMillis());
|
|
|
materialInfoService.saveOrUpdate(materialInfo);
|
|
|
- // materialInfoService.getFile(materialInfo);
|
|
|
+ Thread.sleep(3 * 1000);
|
|
|
+ materialInfoService.getFile(materialInfo);
|
|
|
videoMergeTask.setVideoUrl(url);
|
|
|
videoMergeTask.setStatus(job.getState());
|
|
|
videoMergeTask.setVideoId(materialInfo.getId());
|
|
|
videoMergeTaskService.updateById(videoMergeTask);
|
|
|
- } catch (IOException e) {
|
|
|
+ } catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
}
|