1

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

@@ -89,7 +89,8 @@ public class FileWriterUtil {
         for (File file1 : files) {
             if(file1.isFile()){
                 if( file1.getName().endsWith(".las") || file1.getName().endsWith(".ply")
-                || file1.getName().endsWith(".osgb") || file1.getName().endsWith(".b3dm") || file1.getName().endsWith(".laz")){
+                || file1.getName().endsWith(".osgb") || file1.getName().endsWith(".b3dm")
+                        || file1.getName().endsWith(".laz") || file1.getName().endsWith(".shp")){
                     fileList.add(file1);
                 }
             }else {

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

@@ -37,6 +37,9 @@ public class CommonUpload implements Serializable {
     @TableField("new_file_name")
     private String newFileName;
 
+    @TableField("file_type")
+    private Integer fileType;
+
     @TableField("file_type_str")
     private String fileTypeStr;
 
@@ -62,13 +65,13 @@ public class CommonUpload implements Serializable {
     @TableField("unzip_path")
     private String unzipPath;
 
-    @TableField("file_type")
-    private Integer fileType;
-
     @TableField("wgs84")
     private String wgs84;
 
     @TableField("gcj02")
     private String gcj02;
 
+    @TableField("use_type")
+    private String useType;
+
 }

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

@@ -47,8 +47,6 @@ public class Dict implements Serializable {
     @TableField("sys_user_id")
     private Integer sysUserId;
 
-    @TableField("parent_id")
-    private Integer parentId;
-
-
+    @TableField("use_type")
+    private String useType;
 }

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

@@ -50,5 +50,6 @@ public class DictFile implements Serializable {
     @TableField("upload_id")
     private Integer uploadId;
 
-
+    @TableField("use_type")
+    private String useType;
 }

src/main/java/com/fdkankan/fusion/mq/consumer/OsgbToB3dmConsumer.java

@@ -39,7 +39,6 @@ public class OsgbToB3dmConsumer {
     @Autowired
     LocalToOssUtil localToOssUtil;
 
-    @Async
     public void consumerQueue(Integer uploadId)  {
         String sourcePath = null;
         String localPath = null;