|
@@ -104,11 +104,9 @@ public class UploadResultDataHandler {
|
|
|
}
|
|
|
|
|
|
//户型图上传
|
|
|
- String floorplanCadPath = ossResultPath + "floorplan_cad";
|
|
|
- String cadPicPathFormat = floorplanCadPath + "/floor-cad-%s.%s";
|
|
|
String floorCadPath = dataSource + "/results/floorplan_cad";
|
|
|
+ String dataViewPath = UploadFilePath.DATA_VIEW_PATH + "floor-cad-%s.%s";
|
|
|
//清除原有旧的cad图
|
|
|
- fYunFileService.deleteFolder(floorplanCadPath);
|
|
|
List<String> floorCadList = FileUtils.getFileList(floorCadPath);
|
|
|
if(CollUtil.isNotEmpty(floorCadList)){
|
|
|
floorCadList.stream().forEach(str->{
|
|
@@ -116,7 +114,7 @@ public class UploadResultDataHandler {
|
|
|
String[] arr = substring.split("floor");
|
|
|
String[] arr2 = arr[1].split("\\.");
|
|
|
//上传到用户编辑目录
|
|
|
- uploadMap.put(str, String.format(cadPicPathFormat, arr2[0], arr2[1]));
|
|
|
+ uploadMap.put(str, String.format(dataViewPath, arr2[0], arr2[1]));
|
|
|
});
|
|
|
}
|
|
|
|