Merge branch 'feature-v4.2.0-202206291119' into release

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/V3Controller.java

@@ -111,10 +111,10 @@ public class V3Controller extends BaseController {
 
     /**
      * <p>
-     场景迁移，修改相机id和用户id
+         场景拷贝
      * </p>
-     * @author dengsixing
-     * @date 2022/6/23
+     * @author tianboguang
+     * @date 2022/6/29
      * @return com.fdkankan.common.response.ResultData
      **/
     @PostMapping(value = "/copyScene")

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -1348,14 +1348,14 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
         }
 
         // 拷贝场景编辑资源
-        String oldEditPath = String.format(UploadFilePath.USER_EDIT_PATH, num);
+        String oldEditPath = String.format(UploadFilePath.EDIT_PATH, num);
 
-        String newEditPath = String.format(UploadFilePath.USER_EDIT_PATH, newNum);
+        String newEditPath = String.format(UploadFilePath.EDIT_PATH, newNum);
         uploadToOssUtil.copyFiles(oldEditPath,newEditPath);
 
         // 拷贝场景展示资源
-        String oldViewPath = String.format(UploadFilePath.USER_VIEW_PATH, num);
-        String newViewPath = String.format(UploadFilePath.USER_VIEW_PATH, newNum);
+        String oldViewPath = String.format(UploadFilePath.VIEW_PATH, num);
+        String newViewPath = String.format(UploadFilePath.VIEW_PATH, newNum);
         uploadToOssUtil.copyFiles(oldViewPath,newViewPath);
 
         // 拷贝本地资源
@@ -1365,13 +1365,13 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
 
         // 拷贝数据
         Long proId = scenePro.getId();
-        scenePro.setId(null);
+        scenePro.setId(paramVO.getNewSceneProId());
         scenePro.setWebSite(scenePro.getWebSite().replace(num,newNum));
         scenePro.setSceneName(paramVO.getNewSceneName());
         scenePro.setThumb(scenePro.getThumb().replace(num,newNum));
-        scenePro.setVideos(scenePro.getVideos().replaceAll(num,newNum));
+        scenePro.setVideos(scenePro.getVideos().replaceAll("https://4dkk.4dage.com/data/data"+num,"https://4dkk.4dage.com/scene_view_data/"+newNum+"/data"));
         scenePro.setNum(newNum);
-        sceneProService.save(scenePro);
+        sceneProService.saveOrUpdate(scenePro);
 
         SceneProExt proExt = sceneProExtService.findBySceneProId(proId);
         proExt.setDataSource(paramVO.getDatasource());
@@ -1382,9 +1382,9 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
         Long plusId = scenePlus.getId();
         scenePlus.setNum(newNum);
-        scenePlus.setId(null);
+        scenePlus.setId(paramVO.getNewSceneProId());
         scenePlus.setTitle(scenePro.getSceneName());
-        scenePlusService.save(scenePlus);
+        scenePlusService.saveOrUpdate(scenePlus);
 
         ScenePlusExt plusExt = scenePlusExtService.getScenePlusExtByPlusId(plusId);
         plusExt.setId(null);

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/CopySceneParamVO.java

@@ -18,6 +18,9 @@ public class CopySceneParamVO {
     @NotNull(message = "oldNum不能为空")
     private String oldNum;
 
+    @NotNull(message = "newSceneProId不能为空")
+    private Long newSceneProId;
+
     @NotNull(message = "newNum不能为空")
     private String newNum;