浏览代码

迁移场景,不生成新的dataSource,原始资源不迁移

lyhzzz 2 年之前
父节点
当前提交
7d1580ae0f
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. 6 6
      src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

+ 6 - 6
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -335,8 +335,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             wrapper.eq(ScenePro::getId,scenePro.getId());
             wrapper.set(ScenePro::getCameraId,camera.getId());
             wrapper.set(ScenePro::getUserId,cameraDetail.getUserId());
-            wrapper.set(ScenePro::getStatus,0);
-            this.updateOssStatus(String.format(OssPath.v3_statusPath,scenePro.getNum()),0,"status");
+           // wrapper.set(ScenePro::getStatus,0);
+           // this.updateOssStatus(String.format(OssPath.v3_statusPath,scenePro.getNum()),0,"status");
             this.update(wrapper);
             //场景迁移到另外的相机清除本身在的文件夹
             folderSceneService.delBySceneId(scenePro.getId());
@@ -346,19 +346,19 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             wrapper.eq(ScenePlus::getId,scenePlus.getId());
             wrapper.set(ScenePlus::getCameraId,camera.getId());
             wrapper.set(ScenePlus::getUserId,cameraDetail.getUserId());
-            wrapper.set(ScenePlus::getSceneStatus,0);
-            this.updateOssStatus(String.format(OssPath.v4_statusPath,scenePlus.getNum()),0,"status");
+            //wrapper.set(ScenePlus::getSceneStatus,0);
+            //this.updateOssStatus(String.format(OssPath.v4_statusPath,scenePlus.getNum()),0,"status");
             scenePlusService.update(wrapper);
             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);
+            //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);