浏览代码

更新对音频文件的处理

reghao 2 年之前
父节点
当前提交
827a35c79c
共有 1 个文件被更改,包括 4 次插入5 次删除
  1. 4 5
      dfs-store/src/main/java/cn/reghao/dfs/store/task/AudioFileProcessor.java

+ 4 - 5
dfs-store/src/main/java/cn/reghao/dfs/store/task/AudioFileProcessor.java

@@ -46,7 +46,7 @@ public class AudioFileProcessor {
 
     public UploadFileRet process(ObjectResult objectResult) {
         String originalObjectName = objectResult.getObjectName();
-        String originalObjectId = objectResult.getObjectId();
+        String audioFileId = objectResult.getObjectId();
         boolean duplicate = objectResult.isDuplicate();
         if (duplicate) {
             ObjectResult objectResult1 = putObjectService.copyObject(originalObjectName);
@@ -56,7 +56,7 @@ public class AudioFileProcessor {
             String dupObjectId = objectResult.getDupObjectId();
             AudioFile audioFile = mediaRepository.findAudioFile(dupObjectId);
             String audioCodec = audioFile.getCodec();
-            AudioFile audioFile1 = new AudioFile(originalObjectId, objectId1, audioCodec, url1);
+            AudioFile audioFile1 = new AudioFile(audioFileId, objectId1, audioCodec, url1);
             mediaRepository.saveAudioFile(audioFile1);
             return new UploadFileRet(objectId1, url1);
         }
@@ -73,14 +73,13 @@ public class AudioFileProcessor {
         if (!audioCodecs.contains(audioCodec)) {
             log.info("将 {} 对象的音频转换为 aac 编码", originalObjectName);
             File file = new File(objectResult.getAbsolutePath());
-            UploadFileRet uploadFileRet = getConvertedAudioFile(originalObjectId, file, originalObjectName, ".m4a");
-            return uploadFileRet;
+            return getConvertedAudioFile(audioFileId, file, originalObjectName, ".m4a");
         }
 
         ObjectResult objectResult1 = putObjectService.copyObject(originalObjectName);
         String objectId1 = objectResult1.getObjectId();
         String url1 = objectNameService.getObjectUrl(objectResult1.getObjectName());
-        AudioFile audioFile = new AudioFile(originalObjectId, objectId1, audioCodec, url1);
+        AudioFile audioFile = new AudioFile(audioFileId, objectId1, audioCodec, url1);
         mediaRepository.saveAudioFile(audioFile);
         return new UploadFileRet(objectId1, url1);
     }