|
@@ -1134,9 +1134,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
sceneProEditEntity.setImagesVersion(sceneProEditEntity.getImagesVersion() + 1);
|
|
sceneProEditEntity.setImagesVersion(sceneProEditEntity.getImagesVersion() + 1);
|
|
|
|
|
|
//计算完全景图和球幕视频后,删除计算目录
|
|
//计算完全景图和球幕视频后,删除计算目录
|
|
-// if(FileUtil.exist(target)){
|
|
|
|
-// FileUtil.del(target);
|
|
|
|
-// }
|
|
|
|
|
|
+ if(FileUtil.exist(target)){
|
|
|
|
+ FileUtil.del(target);
|
|
|
|
+ }
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2443,11 +2443,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
FileUtils.delAllFile(target + File.separator + "results");
|
|
FileUtils.delAllFile(target + File.separator + "results");
|
|
}
|
|
}
|
|
//下载data.fdage
|
|
//下载data.fdage
|
|
- if(FYunTypeEnum.AWS.code().equals(this.ossType)){
|
|
|
|
- //亚马逊保持旧方式,超链接capture
|
|
|
|
- CreateObjUtil.createSoftConnection(path + File.separator + "capture", target + File.separator + "capture");
|
|
|
|
- }
|
|
|
|
- fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/" + "data.fdage");
|
|
|
|
|
|
+// if(FYunTypeEnum.AWS.code().equals(this.ossType)){
|
|
|
|
+// //亚马逊保持旧方式,超链接capture
|
|
|
|
+// CreateObjUtil.createSoftConnection(path + File.separator + "capture", target + File.separator + "capture");
|
|
|
|
+// }
|
|
|
|
+// fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/" + "data.fdage");
|
|
|
|
|
|
CreateObjUtil.build3dModel(target , "1");
|
|
CreateObjUtil.build3dModel(target , "1");
|
|
|
|
|