修改文件下载逻辑

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -364,7 +364,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                     CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath);
                     icon = fYunFileConfig.getHost() + "images/images" + sceneNum + "/" + jsonObject.getString("icon");
                     if(FYunTypeEnum.AWS.code().equals(fYunFileService.getFyunType())){
-                        CreateObjUtil.ossFileCp(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath + jsonObject.getString("icon"));
+                        fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath + jsonObject.getString("icon"));
                         icon = fYunFileConfig.getHost() + imgViewPath + jsonObject.getString("icon");
                     }
                     fYunFileService.uploadFile(filePath + jsonObject.getString("icon"), imgViewPath + jsonObject.getString("icon"));
@@ -541,11 +541,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if(!filePath.exists()){
             filePath.mkdirs();
         }
-        if(FYunTypeEnum.AWS.code().equals(fYunFileService.getFyunType())){
-            CreateObjUtil.ossFileCp(ConstantFilePath.OSS_PREFIX + prefixBuffer.toString() + "data.fdage", filePathBuffer.toString() + "data.fdage");
-        }else {
-            CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + prefixBuffer.toString() + "data.fdage", filePathBuffer.toString());
-        }
+        fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + prefixBuffer.toString() + "data.fdage",filePathBuffer.toString() + "data.fdage");
         buildScene(filePathBuffer.toString(), fileId, true, prefixBuffer.toString());
         return ResultData.ok();
     }
@@ -609,11 +605,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if(!filePath.exists()){
             filePath.mkdirs();
         }
-        if(FYunTypeEnum.AWS.code().equals(fYunFileService.getFyunType())){
-            CreateObjUtil.ossFileCp(ConstantFilePath.OSS_PREFIX + prefixBuffer.toString() + "data.fdage", filePathBuffer.toString() + "data.fdage");
-        }else {
-            CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + prefixBuffer.toString() + "data.fdage", filePathBuffer.toString());
-        }
+        fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + prefixBuffer.toString() + "data.fdage", filePathBuffer.toString() + "data.fdage");
         turntableBuildScene(filePathBuffer.toString(), fileId, true, prefixBuffer.toString());
         return ResultData.ok();
     }
@@ -687,7 +679,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath);
             icon = fYunFileConfig.getHost() + imageViewPath + jsonObject.getString("icon");
             if(FYunTypeEnum.AWS.code().equals(fYunFileService.getFyunType())){
-                CreateObjUtil.ossFileCp(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath + jsonObject.getString("icon"));
+                fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath + jsonObject.getString("icon"));
                 icon = fYunFileConfig.getHost() + imageViewPath + jsonObject.getString("icon");
             }
             fYunFileService.uploadFile(filePath + jsonObject.getString("icon"), imageViewPath + jsonObject.getString("icon"));