21

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

@@ -151,7 +151,8 @@ public class LaserService {
     }
 
 
-    public void copy(Long camaraId, String createTime, String newNum, String  path, String sceneKey, String sceneName, Long userId){
+    public void copy(Long camaraId, String createTime, String newNum, Integer status,
+                     String  path, String sceneKey, String sceneName, Long userId){
         String phone = null;
         String snCode = null;
         if(userId != null){

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

@@ -187,7 +187,6 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                     FileUtils.copyDirectiory(scenePath, newScenePath);
                 }
 
-
                 String newVideos = plusExt.getVideos().replaceAll("https://4dkk.4dage.com/data/data" + num, "https://4dkk.4dage.com/scene_view_data/" + newNum + "/data");
                 String oldDataSource  = plusExt.getDataSource();
                 String newDataSource =  sceneProService.setDataSource(plusExt.getDataSource(),time);
@@ -227,6 +226,11 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 sceneEditControls.setEditInfoId(sceneEditInfo.getId());
                 sceneEditControlsService.save(sceneEditControls);
 
+                if(scenePlus.getSceneSource() == 4){  //深时复制
+                    laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,0,null,
+                            sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId());
+                }
+
                 List<Surveillance> list = surveillanceService.list(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getNum, num));
                 if (!Objects.isNull(list)) {
                     list.stream().forEach(item -> {
@@ -275,7 +279,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,laserPath,
+                    laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,2,laserPath,
                             sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId());
                 }
                 sceneCopyLogService.saveByNum(num,newNum,scenePlus.getUserId());

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

@@ -529,7 +529,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         FolderScene folderScene = folderSceneService.getByType(sceneId, null);
         String time = DateUtil.date2String(new Date(),DateUtil.YYYYMMDDHHMMSSSSS_DATA_FORMAT);
 
-
         if(scenePro !=null){        //v3场景复制
             log.info("场景复制--V3--OldNum:{},oldTitle:{},newNum:{},newTitle:{}",
                     scenePro.getNum(),scenePro.getSceneName(),newNum,newTitle);
@@ -581,6 +580,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         oldScene.setDataSource(newDataSource);
 
         this.save(oldScene);
+        if(oldScene.getSceneSource() == 4){  //深时复制
+            laserService.copy(oldScene.getCameraId(),oldScene.getCreateTime(),newNum,0,null,
+                    oldEditScene.getSceneKey(),oldScene.getSceneName(),oldScene.getUserId());
+        }
         //更新video
         Map map = new HashMap();
         JSONObject object = new JSONObject();
@@ -648,7 +651,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,laserPath,
+                    laserService.copy(oldScene.getCameraId(),oldScene.getCreateTime(),newNum,2,laserPath,
                             oldEditScene.getSceneKey(),oldScene.getSceneName(),oldScene.getUserId());
                 }
                 sceneCopyLogService.saveByNum(oldNum,newNum,oldScene.getUserId());
@@ -709,7 +712,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         FileUtils.delAllFile(newDataSource);
 
-
         FileUtils.copyFolderAllFiles(oldDataSource+"/",newDataSource+"/", true);
 
     }