|
@@ -1237,8 +1237,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
if(fdageData.containsKey("icon") && StringUtils.isNotEmpty(fdageData.getString("icon"))){
|
|
if(fdageData.containsKey("icon") && StringUtils.isNotEmpty(fdageData.getString("icon"))){
|
|
String ossPath = ConstantFilePath.OSS_PREFIX + dataSource.replace(ConstantFilePath.BUILD_MODEL_PATH, "")
|
|
String ossPath = ConstantFilePath.OSS_PREFIX + dataSource.replace(ConstantFilePath.BUILD_MODEL_PATH, "")
|
|
.replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "");
|
|
.replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "");
|
|
- fYunFileService.copyFileInBucket(ossPath + fdageData.getString("icon"),imgViewPath + fdageData.getString("icon"));
|
|
|
|
- icon = fYunFileConfig.getHost() + fdageData + fdageData.getString("icon");
|
|
|
|
|
|
+ fYunFileService.copyFileInBucket(ossPath + File.separator + fdageData.getString("icon"),imgViewPath + fdageData.getString("icon"));
|
|
|
|
+ icon = fYunFileConfig.getHost() + imgViewPath + fdageData.getString("icon");
|
|
log.info("上传icon成功....");
|
|
log.info("上传icon成功....");
|
|
}
|
|
}
|
|
buildV3Scene2(dataSource,fdageData,cameraType,sceneNum,cameraEntity,detailEntity,icon);
|
|
buildV3Scene2(dataSource,fdageData,cameraType,sceneNum,cameraEntity,detailEntity,icon);
|
|
@@ -1254,8 +1254,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
if(fdageData.containsKey("icon") && StringUtils.isNotEmpty(fdageData.getString("icon"))){
|
|
if(fdageData.containsKey("icon") && StringUtils.isNotEmpty(fdageData.getString("icon"))){
|
|
String ossPath = ConstantFilePath.OSS_PREFIX + dataSource.replace(ConstantFilePath.BUILD_MODEL_PATH, "")
|
|
String ossPath = ConstantFilePath.OSS_PREFIX + dataSource.replace(ConstantFilePath.BUILD_MODEL_PATH, "")
|
|
.replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "");
|
|
.replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "");
|
|
- fYunFileService.copyFileInBucket(ossPath + fdageData.getString("icon"),imgViewPath + fdageData.getString("icon"));
|
|
|
|
- icon = fYunFileConfig.getHost() + fdageData + fdageData.getString("icon");
|
|
|
|
|
|
+ fYunFileService.copyFileInBucket(ossPath + File.separator + fdageData.getString("icon"),imgViewPath + fdageData.getString("icon"));
|
|
|
|
+ icon = fYunFileConfig.getHost() + imgViewPath + fdageData.getString("icon");
|
|
log.info("上传icon成功....");
|
|
log.info("上传icon成功....");
|
|
}
|
|
}
|
|
buildScenePost(dataSource,fdageData,"V3",cameraType,sceneNum,detailEntity,0,icon);
|
|
buildScenePost(dataSource,fdageData,"V3",cameraType,sceneNum,detailEntity,0,icon);
|