统一把文件类型分三类

src/main/java/com/fd/constant/TypeCode.java

@@ -7,13 +7,15 @@ package com.fd.constant;
  */
 public class TypeCode {
 
-    public static final String FILE_TYPE_RASTER_TIF = "tif"; // 栅格数据
+//    public static final String FILE_TYPE_RASTER_TIF = "tif"; // 栅格数据
+    public static final String FILE_TYPE_RASTER = "raster"; // 栅格数据
 
-    public static final String FILE_TYPE_VECTOR_SHP = "shp"; // 转换后的矢量数据
+//    public static final String FILE_TYPE_VECTOR_SHP = "shp"; // 转换后的矢量数据
 
     public static final String FILE_TYPE_VECTOR = "vector"; // 矢量数据
 
-    public static final String FILE_TYPE_MODEL_OSGB = "osgb"; // 模型数据
+//    public static final String FILE_TYPE_MODEL_OSGB = "osgb"; // 模型数据
+    public static final String FILE_TYPE_MODEL = "model"; // 模型数据
 
 
 

src/main/java/com/fd/controller/FdModelController.java

@@ -54,7 +54,7 @@ public class FdModelController {
             return new R(50007,MsgCode.E50007);
         }
 
-        return fileServer.uploadBigFile(file, TypeCode.FILE_TYPE_MODEL_OSGB);
+        return fileServer.uploadBigFile(file, TypeCode.FILE_TYPE_MODEL);
     }
 
 
@@ -78,7 +78,7 @@ public class FdModelController {
         fileEntity.setFileUrl(INPUT_FILE_PATH + File.separator + fileName);
         fileEntity.setCreateTime(new Date());
         fileEntity.setUpdateTime(new Date());
-        fileEntity.setType(TypeCode.FILE_TYPE_MODEL_OSGB);
+        fileEntity.setType(TypeCode.FILE_TYPE_MODEL);
         fileEntity = fileServer.save(fileEntity);
 
         return new R(200, fileEntity);
@@ -88,7 +88,7 @@ public class FdModelController {
     @PostMapping(value = "list")
     private R list(@RequestBody PageDto param){
         log.info("run list");
-        return fileServer.findByType(TypeCode.FILE_TYPE_MODEL_OSGB, param);
+        return fileServer.findByType(TypeCode.FILE_TYPE_MODEL, param);
     }
 
     /**

src/main/java/com/fd/controller/RasterController.java

@@ -52,14 +52,14 @@ public class RasterController {
             return new R(50008,MsgCode.E50008);
         }
 
-        return fileServer.uploadBigFile(file, TypeCode.FILE_TYPE_RASTER_TIF);
+        return fileServer.uploadBigFile(file, TypeCode.FILE_TYPE_RASTER);
     }
 
     @ApiOperation("获取栅格数据列表")
     @PostMapping(value = "list")
     private R list(@RequestBody PageDto param){
         log.info("run list");
-        return fileServer.findByType(TypeCode.FILE_TYPE_RASTER_TIF, param);
+        return fileServer.findByType(TypeCode.FILE_TYPE_RASTER, param);
     }
 
 
@@ -192,7 +192,7 @@ public class RasterController {
         fileEntity.setFileUrl(INPUT_FILE_PATH + fileName);
         fileEntity.setCreateTime(new Date());
         fileEntity.setUpdateTime(new Date());
-        fileEntity.setType(TypeCode.FILE_TYPE_RASTER_TIF);
+        fileEntity.setType(TypeCode.FILE_TYPE_RASTER);
         fileEntity = fileServer.save(fileEntity);
 
         // 多线程运行切片
@@ -260,7 +260,7 @@ public class RasterController {
         fileEntity.setFileUrl(INPUT_FILE_PATH + "transform_strict" + File.separator + entity.getFileName());
         fileEntity.setCreateTime(new Date());
         fileEntity.setUpdateTime(new Date());
-        fileEntity.setType(TypeCode.FILE_TYPE_RASTER_TIF);
+        fileEntity.setType(TypeCode.FILE_TYPE_RASTER);
         fileEntity = fileServer.save(fileEntity);
 
         return fileEntity;

src/main/java/com/fd/controller/VectorController.java

@@ -55,7 +55,8 @@ public class VectorController {
     @PostMapping(value = "list")
     private R list(@RequestBody PageDto param){
         log.info("run list");
-        return fileServer.findByType(TypeCode.FILE_TYPE_VECTOR, TypeCode.FILE_TYPE_VECTOR_SHP, param);
+//        return fileServer.findByType(TypeCode.FILE_TYPE_VECTOR, TypeCode.FILE_TYPE_VECTOR_SHP, param);
+        return fileServer.findByType(TypeCode.FILE_TYPE_VECTOR, param);
     }
 
     /**
@@ -133,7 +134,7 @@ public class VectorController {
             fileEntity.setFileUrl(directoryPath + File.separator + entity.getFileName());
             fileEntity.setCreateTime(new Date());
             fileEntity.setUpdateTime(new Date());
-            fileEntity.setType(TypeCode.FILE_TYPE_VECTOR_SHP);
+            fileEntity.setType(TypeCode.FILE_TYPE_VECTOR);
             fileEntity = fileServer.save(fileEntity);
         } else if (0 == isJudge){ // 不转换坐标
             log.info("not to transform");