|
@@ -1,17 +1,15 @@
|
|
|
package org.jeecg.modules.ctop.job;
|
|
|
|
|
|
import cn.com.ctop.common.module.entity.MaterialInfo;
|
|
|
-import cn.com.ctop.common.module.entity.VideoMergeTask;
|
|
|
import cn.com.ctop.common.module.entity.VideoWatermarkTask;
|
|
|
import cn.com.ctop.common.module.service.IMaterialInfoService;
|
|
|
-import cn.com.ctop.common.module.service.IVideoMergeTaskService;
|
|
|
import cn.com.ctop.common.module.service.IVideoWatermarkTaskService;
|
|
|
+import cn.com.ctop.common.module.utils.Check;
|
|
|
import cn.com.ctop.common.module.utils.LoadFileUtil;
|
|
|
import cn.com.ctop.common.module.utils.MpsUtils;
|
|
|
import cn.com.ctop.common.module.utils.PropertiesUtils;
|
|
|
import com.aliyuncs.mts.model.v20140618.QueryJobListResponse;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
-import org.jeecg.common.util.DateUtils;
|
|
|
import org.quartz.Job;
|
|
|
import org.quartz.JobExecutionContext;
|
|
|
import org.quartz.JobExecutionException;
|
|
@@ -25,6 +23,7 @@ public class WatermarkVideoJob implements Job {
|
|
|
private IVideoWatermarkTaskService videoWaterMarkService;
|
|
|
@Autowired
|
|
|
private IMaterialInfoService materialInfoService;
|
|
|
+
|
|
|
@Override
|
|
|
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
|
|
|
Thread thread = new Thread() {
|
|
@@ -48,6 +47,10 @@ public class WatermarkVideoJob implements Job {
|
|
|
QueryWrapper<MaterialInfo> materialInfoQueryWrapper = new QueryWrapper<>();
|
|
|
materialInfoQueryWrapper.eq("watermark_code", job.getJobId());
|
|
|
MaterialInfo materialInfo = materialInfoService.getOne(materialInfoQueryWrapper);
|
|
|
+ if (Check.isNull(materialInfo)) {
|
|
|
+ continue;
|
|
|
+
|
|
|
+ }
|
|
|
materialInfo.setWatermarkUrl(url);
|
|
|
materialInfoService.saveOrUpdate(materialInfo);
|
|
|
videoWatermarkTask.setVideoUrl(url);
|