1

src/main/java/com/fdkankan/ucenter/httpClient/service/LaserService.java

@@ -176,7 +176,7 @@ public class LaserService {
     }
 
 
-    public void copy(Long camaraId, String createTime, String newNum, Integer status,
+    public void copy(String oldNum ,Long camaraId, String createTime, String newNum, Integer status,
                      String  path, String sceneKey, String sceneName, Long userId,String version,Integer isObj){
         String phone = null;
         String snCode = null;
@@ -188,6 +188,10 @@ public class LaserService {
             Camera camera = cameraService.getById(camaraId);
             snCode = camera == null ? null :camera.getSnCode();
         }
+        JSONObject sceneInfo = this.getSceneByNum(oldNum);
+        if(sceneInfo != null){
+            sceneName = sceneInfo.getString("title");
+        }
         Map<String,Object> params = new HashMap<>();
         params.put("childName",snCode);
         params.put("createTime", createTime);

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

@@ -249,7 +249,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 sceneEditControlsService.save(sceneEditControls);
 
                 if(scenePlus.getSceneSource() == 4){  //深时复制
-                    laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,0,null,
+                    laserService.copy(num,scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,0,null,
                             sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4",plusExt.getIsObj());
                 }
 
@@ -310,7 +310,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 log.info("复制场景结束-{}", new Date());
                 if(scenePlus.getSceneSource() == 4){  //深时复制
                     String laserPath = laserService.copyDataSource(oldDataSource,plusExt.getDataSource());
-                    laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,2,laserPath,
+                    laserService.copy(num,scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,2,laserPath,
                             sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4",plusExt.getIsObj());
                 } else if(!"aws".equals(NacosProperty.uploadType)){
                     laserService.cloudPointBuild(num,newNum);

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

@@ -751,7 +751,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         this.save(oldScene);
         if(oldScene.getSceneSource() == 4){  //深时复制
-            laserService.copy(oldScene.getCameraId(),oldScene.getCreateTime(),newNum,0,null,
+            laserService.copy(oldNum,oldScene.getCameraId(),oldScene.getCreateTime(),newNum,0,null,
                     oldEditScene.getSceneKey(),oldScene.getSceneName(),oldScene.getUserId(),"V3",oldScene.getIsObj());
         }
         //更新video
@@ -827,7 +827,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 log.info("复制场景结束-{}", new Date());
                 if(oldScene.getSceneSource() == 4){  //深时复制
                     String laserPath = laserService.copyDataSource(preDataSource,oldScene.getDataSource());
-                    laserService.copy(oldScene.getCameraId(),oldScene.getCreateTime(),newNum,2,laserPath,
+                    laserService.copy(oldNum,oldScene.getCameraId(),oldScene.getCreateTime(),newNum,2,laserPath,
                             oldEditScene.getSceneKey(),oldScene.getSceneName(),oldScene.getUserId(),"V3",oldScene.getIsObj());
                 }
                 sceneCopyLogService.saveByNum(oldNum,newNum,oldScene.getUserId());