注册用户复制示例场景

src/main/java/com/fdkankan/scene/mq/consumer/CopySceneConsumer.java

@@ -37,7 +37,8 @@ public class CopySceneConsumer {
             JSONObject jsonObject = JSONObject.parseObject(msg);
             String oldNum = jsonObject.getString("oldNum");
             String newNum = jsonObject.getString("newNum");
-            sceneCopyService.copyScene(oldNum,newNum);
+            Long userId = jsonObject.getLong("userId");
+            sceneCopyService.copyScene(oldNum,newNum, userId);
         }catch (Exception e){
             log.info("copy-scene----消费失败",e);
         }

src/main/java/com/fdkankan/scene/service/ISceneCopyService.java

@@ -2,7 +2,7 @@ package com.fdkankan.scene.service;
 
 public interface ISceneCopyService {
 
-    void copyScene(String oldNum,String newNum);
+    void copyScene(String oldNum,String newNum, Long userId);
 
     Integer isCopyScene(String num);
 }

src/main/java/com/fdkankan/scene/service/impl/SceneCopyServiceImpl.java

@@ -69,18 +69,18 @@ public class SceneCopyServiceImpl implements ISceneCopyService {
     }
 
     @Override
-    public void copyScene(String oldNum, String newNum) {
+    public void copyScene(String oldNum, String newNum, Long userId) {
         ScenePro scenePro = sceneProService.getByNum(oldNum);
         if(scenePro != null && scenePro.getIsUpgrade() == 0){
             cpV3(scenePro,oldNum,newNum);
         }
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(oldNum);
         if(scenePlus != null){
-            cpV4(scenePlus,oldNum,newNum);
+            cpV4(scenePlus,oldNum,newNum, userId);
         }
     }
 
-    private void cpV4(ScenePlus scenePlus, String oldNum, String newNum) {
+    private void cpV4(ScenePlus scenePlus, String oldNum, String newNum, Long userId) {
         try {
             Long plusId = scenePlus.getId();
             ScenePlusExt plusExt = scenePlusExtService.getScenePlusExtByPlusId(plusId);
@@ -91,6 +91,10 @@ public class SceneCopyServiceImpl implements ISceneCopyService {
             scenePlus.setTitle(scenePlus.getTitle() +"(copy)");
             scenePlus.setSceneStatus(0);
             scenePlus.setId(null);
+            if(userId != null){//目标用户ID不为空，则是注册用户复制场景
+                scenePlus.setUserId(userId);
+                scenePlus.setCameraId(null);
+            }
             scenePlusService.save(scenePlus);
 
             this.saveFolder(plusId,scenePlus.getId());