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

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

@@ -1365,7 +1365,7 @@ 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));
@@ -1382,7 +1382,7 @@ 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);
 

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;