|
@@ -115,6 +115,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
supplierWatermarkQueryWrapper.last("limit 1");
|
|
|
SupplierWatermark one = supplierWatermarkService.getOne(supplierWatermarkQueryWrapper);
|
|
|
if (!Check.isNull(one)) {
|
|
|
+ log.info("供应商水印已存在,videoCode:{}", videoSignature);
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -141,13 +142,18 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
SupplierWatermark supplierWatermark = new SupplierWatermark();
|
|
|
supplierWatermark.setVideoSignature(videoSignature);
|
|
|
supplierWatermark.setWatermarkUrl("https://media-1301855440.cos.ap-chongqing.myqcloud.com" + url);
|
|
|
- supplierWatermarkService.save(supplierWatermark);
|
|
|
+ boolean save = supplierWatermarkService.save(supplierWatermark);
|
|
|
+ if (save) {
|
|
|
+ log.info("供应商水印生成完毕,videoCode:{}", videoSignature);
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
thread.start();
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
+ log.info("供应商水印生成异常,videoCode:{}", videoSignature);
|
|
|
e.printStackTrace();
|
|
|
|
|
|
}
|
|
@@ -539,13 +545,12 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
info.setCreateTime(new Date());
|
|
|
info.setUpdateTime(new Date());
|
|
|
info.setType(type);
|
|
|
-
|
|
|
Project project = projectService.getById(projectId);
|
|
|
if (!Check.isNull(project)) {
|
|
|
- info.setSupplierCode(project.getSupplierCode());
|
|
|
+ if (!Check.isNull(project.getSupplierCode())) {
|
|
|
+ info.setSupplierCode(project.getSupplierCode());
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
MaterialCutFrame cutFrame = materialCutFrameService.getCutFrameByCode(code);
|
|
|
if (Check.isNull(cutFrame)) {
|
|
|
String videoUrl = URLDecoder.decode(info.getUrl()).replace("https://media-1301855440.cos.ap-chongqing.myqcloud.com/", "");
|