lyhzzz 2 лет назад
Родитель
Сommit
6cbe5bfc5b

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

@@ -318,12 +318,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         Long subSpace =  oldCameraDetail.getTotalSpace() - oldUseSpace;
 
-
         if(scenePro!=null){
             LambdaUpdateWrapper<ScenePro> wrapper = new LambdaUpdateWrapper<>();
             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");
             this.update(wrapper);
             //场景迁移到另外的相机清除本身在的文件夹
             folderSceneService.delBySceneId(scenePro.getId());
@@ -333,17 +334,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");
             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);
@@ -383,6 +386,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         try {
             newSnCode = newSnCode.toLowerCase();
             String fdagePaht =  dataSource.replace("/mnt/data","home") +"/data.fdage";
+            if(!fYunFileServiceInterface.fileExist(fdagePaht)){
+                return dataSource;
+            }
             localPathFdage = String.format(OssPath.localFdagePath,fdagePaht);
             String fileContent = fYunFileServiceInterface.getFileContent(fdagePaht);
             JSONObject jsonObject = updateFdageJson(JSONObject.parseObject(fileContent), newSnCode);