1

src/main/java/com/fdkankan/fusion/common/util/FileWriterUtil.java

@@ -87,7 +87,7 @@ public class FileWriterUtil {
         }
         for (File file : files) {
             if(file.isFile()){
-                if(file.getName().endsWith(".json")){
+                if(file.getName().endsWith("tileset.json")){
                     return file.getPath();
                 }
             }

src/main/java/com/fdkankan/fusion/common/util/ShellCmd.java

@@ -10,6 +10,7 @@ public class ShellCmd {
 	public static final String FYUN_UPLOAD = "bash /opt/ossutil/fyun-upload.sh %s %s /%s %s %s";
 	public static final String FYUN_DOWN = "bash /opt/ossutil/fyun-download.sh %s /%s %s %s %s";
 
-	public static final String osgbTob3dmCmd = "bash /mnt/fusion/3dtile.sh -f osgb -i " +
+	public static final String osgbTob3dmCmd2 = "bash /mnt/fusion/3dtile.sh -f osgb -i " +
 			"@inputFile -o @outputFile";
+	public static final String osgbTob3dmCmd = "bash /mnt/fusion/bin_osgb2tiles/run_convert.sh @inputFile @outputFile";
 }

src/main/java/com/fdkankan/fusion/entity/Model.java

@@ -101,4 +101,7 @@ public class Model implements Serializable {
 
     @TableField("gcj02")
     private String gcj02;
+
+    @TableField(exist = false)
+    private Integer convertType =1;
 }