|
@@ -277,8 +277,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
}
|
|
|
|
|
|
Long sceneCameraId = scenePro == null ? scenePlus.getCameraId() : scenePro.getCameraId();
|
|
|
- Long space = null;
|
|
|
- space = scenePro == null ? 0 :scenePro.getSpace();
|
|
|
+ Long space = scenePro == null ? 0 :scenePro.getSpace();
|
|
|
String dataSource = scenePro == null ? null :scenePro.getDataSource();
|
|
|
if(scenePlus !=null){
|
|
|
ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
|
|
@@ -317,7 +316,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
// throw new BusinessException(ResultCode.MOVE_ERROR_COPY);
|
|
|
// }
|
|
|
|
|
|
- if(cameraDetail.getType() == 10 || cameraDetail.getType() == 11) { //深时场景
|
|
|
+ if((cameraDetail.getType() == 10 || cameraDetail.getType() == 11) && status ==-2) { //深时场景
|
|
|
//迁移深时 dataSource
|
|
|
File file = new File(dataSource + "_laserData");
|
|
|
if (!file.exists()) {
|