1

src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -252,7 +252,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 //copyDataSource
                 //cn.hutool.core.io.FileUtil.copyContent(new File(oldDataSource),new File(newDataSource),true);
 
-                this.copyOssAndNas(oldNum,newNum);
+                this.copyOssAndNas(oldNum,newNum,sceneCommonService);
 
                 //修改 oss status.json ,nas scene.json
                 String targetData = String.format(SceneResourcePath.DATA_VIEW_PATH,newNum);
@@ -284,7 +284,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         return scenePlus.getId();
     }
 
-    private  void copyOssAndNas(String oldNum,String newNum){
+    private  void copyOssAndNas(String oldNum,String newNum,SceneCommonService sceneCommonService){
         // 拷贝场景编辑资源
         String oldEditPath = String.format(SceneResourcePath.EDIT_PATH_v4, oldNum);
         String newEditPath = String.format(SceneResourcePath.EDIT_PATH_v4, newNum);

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -800,7 +800,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
                 String sourceData = String.format(SceneResourcePath.dataPath, oldNum);
                 String targetData = String.format(SceneResourcePath.dataPath, scenePro.getNum());
-                this.copyOssAndNas(oldNum,scenePro.getNum(),sourceData,targetData);
+                this.copyOssAndNas(oldNum,scenePro.getNum(),sourceData,targetData,sceneCommonService);
                 //修改 oss status.json ,nas scene.json
                 sceneCommonService.updateOssJson(targetData,oldNum,newNum,"status.json");
                 sceneCommonService.updateOssJson(targetData,oldNum,newNum,"hot.json");
@@ -809,15 +809,15 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
                 String sourceImages = String.format(SceneResourcePath.imagesPath, oldNum);
                 String targetImages = String.format(SceneResourcePath.imagesPath, scenePro.getNum());
-                this.copyOssAndNas(oldNum,scenePro.getNum(),sourceImages,targetImages);
+                this.copyOssAndNas(oldNum,scenePro.getNum(),sourceImages,targetImages,sceneCommonService);
 
                 String sourceVideo = String.format(SceneResourcePath.videoPath, oldNum);
                 String targetVideo = String.format(SceneResourcePath.videoPath, scenePro.getNum());
-                this.copyOssAndNas(oldNum,scenePro.getNum(),sourceVideo,targetVideo);
+                this.copyOssAndNas(oldNum,scenePro.getNum(),sourceVideo,targetVideo,sceneCommonService);
 
                 String sourceVoice = String.format(SceneResourcePath.voicePath, oldNum);
                 String targetVoice = String.format(SceneResourcePath.voicePath, scenePro.getNum());
-                this.copyOssAndNas(oldNum,scenePro.getNum(),sourceVoice,targetVoice);
+                this.copyOssAndNas(oldNum,scenePro.getNum(),sourceVoice,targetVoice,sceneCommonService);
 
                 if(scenePro.getSceneSource() == 4){  //深时复制
                     String laserPath = laserService.copyDataSource(oldDataSource,scenePro.getDataSource());
@@ -844,7 +844,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         return scenePro.getId();
     }
-    private void copyOssAndNas(String oldNum ,String newNum ,String sourcePath,String targetPath){
+    private void copyOssAndNas(String oldNum ,String newNum ,String sourcePath,String targetPath,SceneCommonService sceneCommonService){
         log.info("sceneCopy-ossSource-oldNum:{},newNum:{},sourcePath:{},targetPath:{}",oldNum,newNum,sourcePath,targetPath);
         fYunFileServiceInterface.copyFileInBucket(sourcePath,targetPath);
         File fileData = new File(SceneResourcePath.nasBasePath + sourcePath);