1

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

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

src/main/java/com/fdkankan/fusion/down/CaseDownService.java

@@ -179,7 +179,7 @@ public class CaseDownService {
             setRedisProcess(caseId,50);
             //打包zip
             String path = "/mnt/fusion/offline";
-            String name = "offline_"+ caseId+"_"+new Date().getTime();
+            String name = "offline_"+ caseId;
             String zipName = path+File.separator+name+".zip";
             ShellUtil.zipOffline(zipName,name);
             setRedisProcess(caseId,70);

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;
 }