浏览代码

修改dam文件生成逻辑

tianboguang 3 年之前
父节点
当前提交
5b65e52637
共有 1 个文件被更改,包括 12 次插入5 次删除
  1. 12 5
      4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/CreateObjUtil.java

+ 12 - 5
4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/CreateObjUtil.java

@@ -11,6 +11,7 @@ import com.fdkankan.model.proto.Visionmodeldata;
 import com.fdkankan.model.proto.format.JsonFormat;
 import com.google.protobuf.TextFormat;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.ObjectUtils;
 
 import java.io.*;
 import java.util.HashMap;
@@ -257,7 +258,7 @@ public class CreateObjUtil {
 
 	}
 	
-	public static void convertTxtToDam(String srcpath,String despath)throws Exception{
+	public static void convertTxtToDam(String srcpath,String despath,Boolean gzip)throws Exception{
 		BigSceneProto.binary_mesh.Builder builder = BigSceneProto.binary_mesh.newBuilder();
 		InputStream inputStream = new FileInputStream(srcpath);
 		InputStreamReader reader = new InputStreamReader(inputStream, "ASCII");
@@ -275,11 +276,17 @@ public class CreateObjUtil {
 		bis.close();
 		bos.close();
 
-		// gzip压缩
-		FileUtil.writeBytes(ZipUtil.gzip(new File(despath)),despath + ".gzip");
+		if(!ObjectUtils.isEmpty(gzip) && gzip){
+			// gzip压缩
+			FileUtil.writeBytes(ZipUtil.gzip(new File(despath)),despath + ".gzip");
 
-		// 重命名
-		FileUtil.rename(new File(despath + ".gzip"), despath, true);
+			// 重命名
+			FileUtil.rename(new File(despath + ".gzip"), despath, true);
+		}
+	}
+
+	public static void convertTxtToDam(String srcpath,String despath)throws Exception{
+		convertTxtToDam(srcpath,despath,true);
 	}
 	
 	public static void convertVisionmodeldataToTxt(String srcpath,String despath)throws Exception