dengsixing 9 месяцев назад
Родитель
Сommit
5ae15a197b

+ 4 - 4
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -288,10 +288,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);

+ 1 - 1
src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -755,7 +755,7 @@ public class CommonServiceImpl implements ICommonService {
             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()));

+ 2 - 2
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -1894,8 +1894,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 //        String restr = new String(res, "UTF-8");
 //        log.info("uploadFileCustom-params解密结果:" + restr);
 //        JSONObject jsonObject = JSON.parseObject(restr);
-        File tempFile = FileUtil.createTempFile(new File(ConstantFilePath.BASE_PATH + "/temp"));
-
+        File tempFile = FileUtil.createTempFile(new File(ConstantFilePath.BASE_PATH + "/temp/" + UUID.randomUUID() + "." + FileUtil.extName(path)));
+        file.transferTo(tempFile);
         fYunFileService.uploadFile(tempFile.getAbsolutePath(), path);
         return ResultData.ok();
     }