|
@@ -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);
|
|
|
|