diff --git a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java index 3e07afd..0f14633 100644 --- a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java @@ -492,7 +492,6 @@ public class TaskTaskServiceImpl implements TaskService { String hash = MD5.create().digestHex(task.getTaskParams()); String filename = StorageUtil.joinPath(StorageConstant.VLOG_PATH, hash + "_" + task.getScenicId() + ".mp4"); adapter.setAcl(StorageAcl.PUBLIC_READ, filename); - videoReUploader.addVideoTask(video.getId()); int isBuy = 0; FaceEntity face = faceRepository.getFace(task.getFaceId()); if (face != null) { diff --git a/src/main/java/com/ycwl/basic/utils/VideoReUploader.java b/src/main/java/com/ycwl/basic/utils/VideoReUploader.java index fe2d462..9169074 100644 --- a/src/main/java/com/ycwl/basic/utils/VideoReUploader.java +++ b/src/main/java/com/ycwl/basic/utils/VideoReUploader.java @@ -7,15 +7,12 @@ import com.ycwl.basic.mapper.SourceMapper; import com.ycwl.basic.mapper.VideoMapper; import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity; import com.ycwl.basic.model.pc.source.entity.SourceEntity; -import com.ycwl.basic.model.pc.video.entity.VideoEntity; import com.ycwl.basic.repository.ScenicRepository; import com.ycwl.basic.repository.VideoRepository; import com.ycwl.basic.service.pc.ScenicService; import com.ycwl.basic.storage.adapters.IStorageAdapter; -import com.ycwl.basic.storage.enums.StorageAcl; import com.ycwl.basic.storage.utils.StorageUtil; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -94,44 +91,4 @@ public class VideoReUploader { } }); } - public void addVideoTask(Long videoId) { - VideoEntity entity = videoMapper.getEntity(videoId); - if (entity == null) { - return; - } - if (entity.getScenicId() == null) { - return; - } - final String dstFilePath = StorageUtil.joinPath(StorageConstant.VLOG_PATH, entity.getTaskId() + "_" + entity.getScenicId() + ".mp4"); - final IStorageAdapter adapter = scenicService.getScenicStorageAdapter(entity.getScenicId()); - if (Strings.CS.equals(entity.getVideoUrl(), adapter.getUrl(dstFilePath))) { - return; - } - String tmpFilePath = UUID.randomUUID().toString(); - executor.execute(() -> { - // 先下载,后上传 - File dstFile = new File(tmpFilePath); - log.info("下载视频:{};videoId:{}", entity.getVideoUrl(), videoId); - long size = HttpUtil.downloadFile(entity.getVideoUrl(), dstFile); - log.info("下载视频完成:{};大小:{};videoId:{}", entity.getVideoUrl(), size, videoId); - try { - log.info("开始上传:{};videoId:{}", dstFilePath, videoId); - String newUrl = adapter.uploadFile("video/mp4", dstFile, dstFilePath); - adapter.setAcl(StorageAcl.PUBLIC_READ, dstFilePath); - log.info("上传成功:{};videoId:{}", newUrl, videoId); - VideoEntity updateEntity = new VideoEntity(); - updateEntity.setId(videoId); - updateEntity.setVideoUrl(newUrl); - videoMapper.update(updateEntity); - } catch (Exception e) { - log.info("上传失败:{};videoId:{}", dstFilePath, videoId, e); - } finally { - videoRepository.clearVideoCache(videoId); - try { - dstFile.delete(); - } catch (Exception ignored) { - } - } - }); - } }