浏览代码

v3编辑器 去掉旧的下载脚本调用

dengsixing 2 年之前
父节点
当前提交
08bfb378bc

+ 2 - 12
src/main/java/com/fdkankan/scene/service/impl/SceneProAppServiceImpl.java

@@ -1285,12 +1285,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
                 FileUtils.deleteFile(partPath + File.separator + fileName);
             }
 
-            if(FYunTypeEnum.AWS.code().equals(this.ossType)){
-                CreateObjUtil.ossFileCp("voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator + fileName);
-            }else {
-                CreateObjUtil.ossUtilCp("voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator);
-                new File(partPath + File.separator + soundFile).renameTo(new File(partPath + File.separator + fileName));
-            }
+            fYunFileService.downloadFile("voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator + fileName);
 
             //获取总音频多少段,每段时长
             String[] time = times.split(",");
@@ -1347,12 +1342,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         }
 
         FileUtils.delAllFile(path + File.separator + "part");
-        if(FYunTypeEnum.AWS.code().equals(this.ossType)){
-            CreateObjUtil.ossFileCp("voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator + fileName);
-        }else {
-            CreateObjUtil.ossUtilCp("voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator);
-            new File(partPath + File.separator + soundFile).renameTo(new File(partPath + File.separator + fileName));
-        }
+        fYunFileService.downloadFile("voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator + fileName);
 
         FileUtils.copyFile(partPath+File.separator+fileName, path + File.separator + originalFileName, true);
 

+ 2 - 2
src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -1002,7 +1002,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                         //亚马逊保持旧方式,超链接capture
                         CreateObjUtil.createSoftConnection(path + File.separator + "capture", target + File.separator + "capture");
                     }
-                    CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/");
+                    fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/" + "data.fdage");
 
                     CreateObjUtil.build3dModel(target , "1");
 
@@ -2436,7 +2436,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             //亚马逊保持旧方式,超链接capture
             CreateObjUtil.createSoftConnection(path + File.separator + "capture", target + File.separator + "capture");
         }
-        CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/");
+        fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/" + "data.fdage");
 
         CreateObjUtil.build3dModel(target , "1");
 

+ 1 - 2
src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -397,8 +397,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
             File file = new File(backpath);
 
             //验证video 文件夹下是否有备份
-            CreateObjUtil.ossUtilCp("video/video" +sceneProEntity.getNum()  + File.separator,
-                sceneProEntity.getDataSource() + "_rv" + File.separator + "videoback");
+            fYunFileService.downloadFileByCommand(sceneProEntity.getDataSource() + "_rv" + File.separator + "videoback", "video/video" +sceneProEntity.getNum()  + File.separator);
 
             String name = "";
             Map<String,String> map = new HashMap<String,String>();