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 = "sudo docker run --rm -v /mnt/fusion:/mnt/fusion 3dtile:v2 /mnt/fusion/3dtile.sh -f osgb -i " +
-			"%s -o %s";
+/*	public static final String osgbTob3dmCmd = "sudo docker run --rm -v /mnt/fusion:/mnt/fusion 3dtile:v2 /mnt/fusion/3dtile.sh -f osgb -i " +
+			"%s -o %s";*/
+	public static final String osgbTob3dmCmd = "bash /mnt/fusion/bin_osgb2tiles/run_convert.sh %s %s";
 }

src/main/java/com/fdkankan/fusion/controller/ModelController.java

@@ -78,7 +78,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/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;
 }

src/main/java/com/fdkankan/fusion/service/impl/CommonUploadServiceImpl.java

@@ -276,6 +276,9 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
         upload.setResultFileFormat(replace1);
         upload.setStatus(status);
         upload.setUnzipPath(unzipPath);
+        if("osgb".equals(resultFormat)){
+            upload.setConvertType(1);
+        }
         this.save(upload);
 
         DictFile dictFile = new DictFile();

src/main/java/com/fdkankan/fusion/service/impl/UploadService.java

@@ -72,7 +72,6 @@ public class UploadService {
             throw new BusinessException(ResultCode.UPLOAD_FILE_NO_EXIST);
         }
         if(file.getSize()>10 * 1024 * 1024 * 100){
-            System.out.println(file.getSize());
             throw new BusinessException(ResultCode.UPLOAD_FILE_TO_LONG);
         }
         //获取文件名