|
@@ -285,10 +285,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
|
|
|
fYunFileService.uploadMulFiles(uploadFiles);
|
|
|
|
|
|
//修改oss上dam的内容编码
|
|
|
- Map<String,String> damFileHeaders = new HashMap<>();
|
|
|
- damFileHeaders.put("Content-Encoding","gzip");
|
|
|
- String damPath = path + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam";
|
|
|
- fYunFileService.uploadFile(damPath, String.format(UploadFilePath.IMG_VIEW_PATH, sceneCode) + ConstantFileName.modelUUID + "_50k.dam", damFileHeaders);
|
|
|
+// Map<String,String> damFileHeaders = new HashMap<>();
|
|
|
+// damFileHeaders.put("Content-Encoding","gzip");
|
|
|
+// String damPath = path + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam";
|
|
|
+// fYunFileService.uploadFile(damPath, String.format(UploadFilePath.IMG_VIEW_PATH, sceneCode) + ConstantFileName.modelUUID + "_50k.dam", damFileHeaders);
|
|
|
|
|
|
//拷贝部分文件到编辑目录,用于用户编辑
|
|
|
this.copyToEditDir(sceneCode);
|
|
@@ -519,7 +519,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
|
|
|
if (!gen3dTiles) {
|
|
|
String damPath = path + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam";
|
|
|
CreateObjUtil.convertTxtToDam(path + File.separator + "results" + File.separator + "tex" + File.separator + "modeldata.txt", damPath);
|
|
|
- FileUtil.writeBytes(ZipUtil.gzip(new File(damPath)), damPath);
|
|
|
+// FileUtil.writeBytes(ZipUtil.gzip(new File(damPath)), damPath);
|
|
|
map.put(damPath, imagesPath + ConstantFileName.modelUUID + "_50k.dam");
|
|
|
}else{
|
|
|
List<String> list = FileUtils.list(new File(path + File.separator + "results" + File.separator + ModelKind.THREE_D_TILE.code()));
|