|
@@ -1110,16 +1110,12 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
//获取解压后的资源的data.fdage中的数据
|
|
|
File folderPath = new File(path);
|
|
|
|
|
|
- if (fyunType.equals(FYunTypeEnum.AWS.code())) {
|
|
|
- fYunFileService.downloadFileByCommand(bucket, path + "/capture/",
|
|
|
- ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, ""));
|
|
|
- } else {
|
|
|
- String dataFdageOssPath =
|
|
|
- ConstantFilePath.OSS_PREFIX +
|
|
|
- path.replace(ConstantFilePath.BUILD_MODEL_PATH, "")
|
|
|
- .replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "") + "/data.fdage";
|
|
|
- fYunFileService.downloadFileByCommand(bucket, path + "/capture/data.fdage", dataFdageOssPath);
|
|
|
- }
|
|
|
+
|
|
|
+ String dataFdageOssPath = ConstantFilePath.OSS_PREFIX
|
|
|
+ + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "")
|
|
|
+ .replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "") + "/data.fdage";
|
|
|
+ fYunFileService.downloadFileByCommand(bucket, path + "/capture", dataFdageOssPath);
|
|
|
+
|
|
|
String data = FileUtils.readFile(folderPath.getAbsolutePath() + File.separator + "capture" + File.separator + "data.fdage");
|
|
|
com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(data);
|
|
|
if(ObjectUtils.isEmpty(jsonObject)){
|