异步复制场景

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

@@ -98,64 +98,64 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
         ExecutorService executor = ThreadUtil.newSingleExecutor();
         CompletableFuture.runAsync(() -> {
-        String oldDataSource = plusExt.getDataSource();
+            String oldDataSource = plusExt.getDataSource();
 
-        String newDataSource = sceneCommonService.getNewDataSource(oldDataSource);
+            String newDataSource = sceneCommonService.getNewDataSource(oldDataSource);
 
-        log.info("sceneCopy-V4-oldNum:{},oldDataSource:{},newNum:{},newDataSource:{}",
-                oldNum,oldDataSource,newNum,newDataSource);
+            log.info("sceneCopy-V4-oldNum:{},oldDataSource:{},newNum:{},newDataSource:{}",
+                    oldNum,oldDataSource,newNum,newDataSource);
 
 
 
-        String newVideos = plusExt.getVideos();
-        if(StrUtil.isNotEmpty(newVideos)){
-            newVideos = plusExt.getVideos().replaceAll("/data/data" + oldNum, "/scene_view_data/" + newNum + "/data").replaceAll(oldNum, newNum);
-        }
-        plusExt.setId(null);
-        plusExt.setPlusId(scenePlus.getId());
-        plusExt.setDataSource(newDataSource);
-        plusExt.setWebSite(plusExt.getWebSite().replace(oldNum, newNum));
-        plusExt.setThumb(plusExt.getThumb().replace(oldNum, newNum));
-        plusExt.setVideos(newVideos);
-        plusExt.setViewCount(0);
-        scenePlusExtService.save(plusExt);
-
-        SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(plusId);
-        Long sceneEditInfoId = sceneEditInfo.getId();
-
-        sceneEditInfo.setId(null);
-        sceneEditInfo.setScenePlusId(scenePlus.getId());
-        sceneEditInfo.setSceneProId(null);
-        sceneEditInfo.setTitle(scenePlus.getTitle());
-        sceneEditInfoService.save(sceneEditInfo);
-
-        SceneEditInfoExt sceneEditInfoExt = sceneEditInfoExtService.getByEditInfoId(sceneEditInfoId);
-        sceneEditInfoExt.setId(null);
-        sceneEditInfoExt.setEditInfoId(sceneEditInfo.getId());
-        sceneEditInfoExt.setScenePlusId(scenePlus.getId());
-        sceneEditInfoExt.setSceneProId(null);
-        sceneEditInfoExtService.save(sceneEditInfoExt);
-
-        SceneEditControls sceneEditControls = sceneEditControlsService.getBySceneEditId(sceneEditInfoId);
-        sceneEditControls.setId(null);
-        sceneEditControls.setEditInfoId(sceneEditInfo.getId());
-        sceneEditControlsService.save(sceneEditControls);
-
-        List<Surveillance> list = surveillanceService.list(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getNum, oldNum));
-        if (!Objects.isNull(list)) {
-            list.stream().forEach(item -> {
-                item.setNum(newNum);
-                item.setId(null);
-                surveillanceService.save(item);
-            });
-        }
+            String newVideos = plusExt.getVideos();
+            if(StrUtil.isNotEmpty(newVideos)){
+                newVideos = plusExt.getVideos().replaceAll("/data/data" + oldNum, "/scene_view_data/" + newNum + "/data").replaceAll(oldNum, newNum);
+            }
+            plusExt.setId(null);
+            plusExt.setPlusId(scenePlus.getId());
+            plusExt.setDataSource(newDataSource);
+            plusExt.setWebSite(plusExt.getWebSite().replace(oldNum, newNum));
+            plusExt.setThumb(plusExt.getThumb().replace(oldNum, newNum));
+            plusExt.setVideos(newVideos);
+            plusExt.setViewCount(0);
+            scenePlusExtService.save(plusExt);
+
+            SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(plusId);
+            Long sceneEditInfoId = sceneEditInfo.getId();
+
+            sceneEditInfo.setId(null);
+            sceneEditInfo.setScenePlusId(scenePlus.getId());
+            sceneEditInfo.setSceneProId(null);
+            sceneEditInfo.setTitle(scenePlus.getTitle());
+            sceneEditInfoService.save(sceneEditInfo);
+
+            SceneEditInfoExt sceneEditInfoExt = sceneEditInfoExtService.getByEditInfoId(sceneEditInfoId);
+            sceneEditInfoExt.setId(null);
+            sceneEditInfoExt.setEditInfoId(sceneEditInfo.getId());
+            sceneEditInfoExt.setScenePlusId(scenePlus.getId());
+            sceneEditInfoExt.setSceneProId(null);
+            sceneEditInfoExtService.save(sceneEditInfoExt);
+
+            SceneEditControls sceneEditControls = sceneEditControlsService.getBySceneEditId(sceneEditInfoId);
+            sceneEditControls.setId(null);
+            sceneEditControls.setEditInfoId(sceneEditInfo.getId());
+            sceneEditControlsService.save(sceneEditControls);
+
+            List<Surveillance> list = surveillanceService.list(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getNum, oldNum));
+            if (!Objects.isNull(list)) {
+                list.stream().forEach(item -> {
+                    item.setNum(newNum);
+                    item.setId(null);
+                    surveillanceService.save(item);
+                });
+            }
 
-        if(scenePlus.getSceneSource() == 4){  //深时复制
-            laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,0,null,
-                    sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4");
-        }else {
-            laserService.cloudPointBuild(oldNum,newNum);
-        }
+            if(scenePlus.getSceneSource() == 4){  //深时复制
+                laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,0,null,
+                        sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4");
+            }else {
+                laserService.cloudPointBuild(oldNum,newNum);
+            }
 
             try {
                 //重新生成编辑页基础设置二维码

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

@@ -224,30 +224,30 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         ExecutorService executor = ThreadUtil.newSingleExecutor();
         CompletableFuture.runAsync(() -> {
 
-        String oldDataSource = scenePro.getDataSource();
-        String newDataSource = sceneCommonService.getNewDataSource(oldDataSource);
-
-        log.info("sceneCopy--oldNum:{},oldDataSource:{},newNum:{},newDataSource:{}",
-                oldNum,oldDataSource,newNum,newDataSource);
-
-        scenePro.setDataSource(newDataSource);
-        this.updateById(scenePro);
-
-        SceneProEdit oldEditScene = sceneProEditService.getByProId(sceneProId);
-        oldEditScene.setId(null);
-        oldEditScene.setProId(scenePro.getId());
-        oldEditScene.setScreencapVoiceSrc(oldEditScene.getScreencapVoiceSrc() == null ? null : oldEditScene.getScreencapVoiceSrc().replace(oldNum, scenePro.getNum()));
-        oldEditScene.setScreencapVoiceSound(oldEditScene.getScreencapVoiceSound() == null ? null : oldEditScene.getScreencapVoiceSound().replace(oldNum, scenePro.getNum()));
-        oldEditScene.setScreencapVoiceSoundsync(oldEditScene.getScreencapVoiceSoundsync() == null ? null : oldEditScene.getScreencapVoiceSoundsync().replace(oldNum, scenePro.getNum()));
-        oldEditScene.setPlayData(oldEditScene.getPlayData() == null ? null : oldEditScene.getPlayData().replace(oldNum, scenePro.getNum()));
-        oldEditScene.setScreencapThumb(oldEditScene.getScreencapThumb() == null ? null : oldEditScene.getScreencapThumb().replace(oldNum, scenePro.getNum()));
-        oldEditScene.setFloorPlanPng(oldEditScene.getFloorPlanPng() == null ? null : oldEditScene.getFloorPlanPng().replace(oldNum, scenePro.getNum()));
-        sceneProEditService.save(oldEditScene);
-
-        if(scenePro.getSceneSource() == 4){  //深时复制
-            laserService.copy(scenePro.getCameraId(),scenePro.getCreateTime(),newNum,0,null,
-                    oldEditScene.getSceneKey(),scenePro.getSceneName(),scenePro.getUserId(),"V3");
-        }
+            String oldDataSource = scenePro.getDataSource();
+            String newDataSource = sceneCommonService.getNewDataSource(oldDataSource);
+
+            log.info("sceneCopy--oldNum:{},oldDataSource:{},newNum:{},newDataSource:{}",
+                    oldNum,oldDataSource,newNum,newDataSource);
+
+            scenePro.setDataSource(newDataSource);
+            this.updateById(scenePro);
+
+            SceneProEdit oldEditScene = sceneProEditService.getByProId(sceneProId);
+            oldEditScene.setId(null);
+            oldEditScene.setProId(scenePro.getId());
+            oldEditScene.setScreencapVoiceSrc(oldEditScene.getScreencapVoiceSrc() == null ? null : oldEditScene.getScreencapVoiceSrc().replace(oldNum, scenePro.getNum()));
+            oldEditScene.setScreencapVoiceSound(oldEditScene.getScreencapVoiceSound() == null ? null : oldEditScene.getScreencapVoiceSound().replace(oldNum, scenePro.getNum()));
+            oldEditScene.setScreencapVoiceSoundsync(oldEditScene.getScreencapVoiceSoundsync() == null ? null : oldEditScene.getScreencapVoiceSoundsync().replace(oldNum, scenePro.getNum()));
+            oldEditScene.setPlayData(oldEditScene.getPlayData() == null ? null : oldEditScene.getPlayData().replace(oldNum, scenePro.getNum()));
+            oldEditScene.setScreencapThumb(oldEditScene.getScreencapThumb() == null ? null : oldEditScene.getScreencapThumb().replace(oldNum, scenePro.getNum()));
+            oldEditScene.setFloorPlanPng(oldEditScene.getFloorPlanPng() == null ? null : oldEditScene.getFloorPlanPng().replace(oldNum, scenePro.getNum()));
+            sceneProEditService.save(oldEditScene);
+
+            if(scenePro.getSceneSource() == 4){  //深时复制
+                laserService.copy(scenePro.getCameraId(),scenePro.getCreateTime(),newNum,0,null,
+                        oldEditScene.getSceneKey(),scenePro.getSceneName(),scenePro.getUserId(),"V3");
+            }
 
         /*
          *cp oss nas