1

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/controller/ModelController.java

@@ -79,7 +79,7 @@ public class ModelController extends BaseController{
         model.setModelType(commonUpload.getResultFileFormat());
         model.setWgs84(commonUpload.getWgs84());
         model.setGcj02(commonUpload.getGcj02());
-
+        model.setConvertType(commonUpload.getConvertType());
         JSONArray jsonArray = new JSONArray();
         jsonArray.add(commonUpload.getFileUrl());
         model.setModelGlbUrl(jsonArray.toJSONString());

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

@@ -71,5 +71,10 @@ public class CaseOverview implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
+    @TableField("kankan_cover")
+    private String kankanCover;
+
+    @TableField(exist = false)
+    private CaseTabulation caseTabulation;
 
 }

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

@@ -72,4 +72,7 @@ public class CommonUpload implements Serializable {
 
     @TableField("use_type")
     private String useType;
+
+    @TableField("convert_type")
+    private Integer convertType;
 }

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

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