记得上下班打卡 | git大法好,push需谨慎

Commit 5101e4e4 authored by jiangxiulong's avatar jiangxiulong

保证上传过的文件也能截帧

parent 9bc20ed5
...@@ -99,7 +99,7 @@ public class AlOssController { ...@@ -99,7 +99,7 @@ public class AlOssController {
PlatformOssFiles ossFile = this.getOldOssFile(fileNew); PlatformOssFiles ossFile = this.getOldOssFile(fileNew);
UploadVo uploadVo = new UploadVo(); UploadVo uploadVo = new UploadVo();
try { try {
if (null == ossFile) { if (null == ossFile || (isCutFrame > 0 && ossFile.getVideoImg().isEmpty())) { //保证上传过的文件也能截帧
// 上传 // 上传
ossFile = this.uploadOssFile(file, pathName, buckType, resize, fileNew, isCutFrame); ossFile = this.uploadOssFile(file, pathName, buckType, resize, fileNew, isCutFrame);
} }
...@@ -127,6 +127,7 @@ public class AlOssController { ...@@ -127,6 +127,7 @@ public class AlOssController {
List<PlatformOssFiles> platformOssFiles = platformOssFilesMapper.selectList( List<PlatformOssFiles> platformOssFiles = platformOssFilesMapper.selectList(
Wrappers.lambdaQuery(PlatformOssFiles.class) Wrappers.lambdaQuery(PlatformOssFiles.class)
.eq(PlatformOssFiles::getMd5str, fileMD5) .eq(PlatformOssFiles::getMd5str, fileMD5)
.orderByDesc(PlatformOssFiles::getMid)
); );
if (CollectionUtils.isEmpty(platformOssFiles)) { if (CollectionUtils.isEmpty(platformOssFiles)) {
return null; return null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment