1

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

@@ -309,10 +309,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(!oldCameraDetail.getType().equals(cameraDetail.getType())){
             throw new BusinessException(ResultCode.CAMERA_TYPE_NOT_ERROR);
         }
-        String home = dataSource.replace("/mnt/data", "home")+"/data.fdage";
-        if(!fYunFileServiceInterface.fileExist(home)){
-            throw new BusinessException(ResultCode.MOVE_ERROR);
-        }
+//        String home = dataSource.replace("/mnt/data", "home")+"/data.fdage";
+//        if(!fYunFileServiceInterface.fileExist(home)){
+//            throw new BusinessException(ResultCode.MOVE_ERROR);
+//        }
 
         HashMap<String, SceneCopyLog> byNewNumList = copyLogService.getByNewNumList(Arrays.asList(param.getNum()));
         if(byNewNumList.size() >0){
@@ -345,7 +345,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             wrapper.set(ScenePro::getStatus,0);
             this.update(wrapper);
             //场景迁移到另外的相机清除本身在的文件夹
-            this.updateOssStatus(String.format(OssPath.v3_statusPath,scenePro.getNum()),0,"status");
+           // this.updateOssStatus(String.format(OssPath.v3_statusPath,scenePro.getNum()),0,"status");
             folderSceneService.delBySceneId(scenePro.getId());
         }
         if(scenePlus!=null){
@@ -355,18 +355,18 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             wrapper.set(ScenePlus::getUserId,cameraDetail.getUserId());
             wrapper.set(ScenePlus::getSceneStatus,0);
             scenePlusService.update(wrapper);
-            this.updateOssStatus(String.format(OssPath.v4_statusPath,scenePlus.getNum()),0,"status");
+           // this.updateOssStatus(String.format(OssPath.v4_statusPath,scenePlus.getNum()),0,"status");
             folderSceneService.delBySceneId(scenePlus.getId());
         }
         //协作相机
         sceneResourceCameraService.setCooperationUser(cameraDetail,param.getNum());
 
-        String newDataSource = updateFdageNewDataSource(scenePro, scenePlus, oldCamera.getSnCode(), param.getSnCode(), dataSource);
+      //  String newDataSource = updateFdageNewDataSource(scenePro, scenePlus, oldCamera.getSnCode(), param.getSnCode(), dataSource);
 
         if(cameraDetail.getType() == 10 || cameraDetail.getType() == 11){       //深时场景
             //迁移深时 dataSource
-            FileUtil.move(new File(dataSource +"_laserData"),new File(newDataSource+"_laserData"),true);
-            laserService.move(param.getNum(),oldCamera.getSnCode(),camera.getSnCode(),cameraDetail.getUserId(),newDataSource);
+            //FileUtil.move(new File(dataSource +"_laserData"),new File(newDataSource+"_laserData"),true);
+            laserService.move(param.getNum(),oldCamera.getSnCode(),camera.getSnCode(),cameraDetail.getUserId(),dataSource);
         }
         cameraDetailService.initSpace(oldCameraDetail);
         cameraDetailService.initSpace(cameraDetail);