|
@@ -35,9 +35,7 @@ public class SceneDataDownloadServiceImpl extends ServiceImpl<SceneDataDownloadM
|
|
|
@Value("${laserConfig.defaultFolder}")
|
|
|
private String laserDefaultFolder;
|
|
|
@Value("${laserConfig.ossUrl}")
|
|
|
- private String laserOSSurl;
|
|
|
- @Value("${openApiPath.temp}")
|
|
|
- private String tempPath;
|
|
|
+ private String laserOSSUrl;
|
|
|
|
|
|
|
|
|
|
|
@@ -63,7 +61,7 @@ public class SceneDataDownloadServiceImpl extends ServiceImpl<SceneDataDownloadM
|
|
|
if (CollectionUtil.isNotEmpty(sceneDataDownloadEntityList) &&fYunFileService.fileExist(laserBucket,xlsxUrl)&&e57Flag&&e57DBFlag){
|
|
|
log.info("场景存在库");
|
|
|
List<SceneDataDownloadVO> sceneDataDownloadVOS = sceneDataDownloadEntityList.stream()
|
|
|
- .map(sceneData -> new SceneDataDownloadVO(sceneData.getFileName(),laserOSSurl+sceneData.getOssKey()))
|
|
|
+ .map(sceneData -> new SceneDataDownloadVO(sceneData.getFileName(),laserOSSUrl+sceneData.getOssKey()))
|
|
|
.collect(Collectors.toList());
|
|
|
return ResultData.ok(sceneDataDownloadVOS);
|
|
|
}else {
|
|
@@ -114,7 +112,7 @@ public class SceneDataDownloadServiceImpl extends ServiceImpl<SceneDataDownloadM
|
|
|
dataDownloadEntities.add(findAndSave(sceneCode, userId, file, name, 1));
|
|
|
}
|
|
|
List<SceneDataDownloadVO> sceneDataDownloadVOS = dataDownloadEntities.stream()
|
|
|
- .map(sceneData -> new SceneDataDownloadVO(sceneData.getFileName(),laserOSSurl+sceneData.getOssKey()))
|
|
|
+ .map(sceneData -> new SceneDataDownloadVO(sceneData.getFileName(),laserOSSUrl+sceneData.getOssKey()))
|
|
|
.collect(Collectors.toList());
|
|
|
return ResultData.ok(sceneDataDownloadVOS);
|
|
|
}
|