dengsixing 11 mesiacov pred
rodič
commit
83e3c098dd

+ 14 - 26
4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/CreateObjUtil.java

@@ -352,37 +352,25 @@ public class CreateObjUtil {
 
 	public static void main(String[] args) throws Exception {
 
-		convertDamToTxt("D:\\test\\01c0889ce8f34afc885fafdc94bec106_50k.dam", "D:\\test\\modeldata.txt");
+		convertVisionmodeldataToTxt("D:\\test\\test\\vision.modeldata", "D:\\test\\test\\vision.txt");
+		FileUtil.del("D:\\test\\test");
 
 	}
 
-	public static void convertVisionmodeldataToTxt(String srcpath,String despath)throws Exception
-	{
-		try
-		{
-			File file = new File(srcpath);
-			FileInputStream fis=new FileInputStream(file);
-
+	public static void convertVisionmodeldataToTxt(String srcpath,String despath)throws Exception {
+		try (FileInputStream fis = new FileInputStream(srcpath)){
 			Visionmodeldata.NavigationInfo data_NavigationInfo = Visionmodeldata.NavigationInfo.parseFrom(fis);
-
-			//PrintStream out = new PrintStream(despath);
 			String jsonFormat1 = JsonFormat.printToString(data_NavigationInfo);
-			ByteArrayInputStream stream = new ByteArrayInputStream(jsonFormat1.getBytes());
-	        BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(despath));//设置输出路径
-	        BufferedInputStream bis = new BufferedInputStream(stream);
-	        int b = -1;
-	        while ((b = bis.read()) != -1) {
-	           bos.write(b);
-	        }
-			//out.close();
-	        bis.close();
-	        bos.close();
-		}
-		catch(Exception e)
-		{
-			StringWriter trace=new StringWriter();
-	        e.printStackTrace(new PrintWriter(trace));
-	        log.error(trace.toString());
+			try (
+				ByteArrayInputStream stream = new ByteArrayInputStream(jsonFormat1.getBytes());
+				BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(despath));//设置输出路径
+				BufferedInputStream bis = new BufferedInputStream(stream)
+			){
+				int b = -1;
+				while ((b = bis.read()) != -1) {
+					bos.write(b);
+				}
+			}
 		}
 	}
 

+ 2 - 0
4dkankan-utils-rabbitmq/src/main/java/com/fdkankan/rabbitmq/bean/BuildSceneCallMessage.java

@@ -21,4 +21,6 @@ public class BuildSceneCallMessage extends BaseBuildSceneMessage {
     private String buildType;
 
     private Map<String,Object> ext;
+
+    private String bizType;
 }

+ 2 - 0
4dkankan-utils-rabbitmq/src/main/java/com/fdkankan/rabbitmq/bean/BuildSceneProcessLogMessage.java

@@ -18,4 +18,6 @@ public class BuildSceneProcessLogMessage implements Serializable {
     private int buildStatus;
 
     private String queueName;
+
+    private String bizType;
 }