1

src/main/java/com/fdkankan/manage/constant/FileTypeEnum.java

@@ -10,7 +10,8 @@ public enum FileTypeEnum {
     IMAGE(0,"图片", Arrays.asList("jpg","png","jpeg")),
     VIDEO(1,"视频",Arrays.asList("mp4")),
     MUSIC(2,"音频",Arrays.asList("wav","mp3")),
-    MODEL(3,"模型",Arrays.asList("obj","osgb","b3dm","ply","las","laz","shp")),
+    MODEL(3,"模型",Arrays.asList("obj","osgb","b3dm","ply","las","laz")),
+    OTHER(4,"其他",Arrays.asList("shp")),
 
     ;
     int code;

src/main/java/com/fdkankan/manage/httpClient/param/LaserSceneParam.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 @Data
 public class LaserSceneParam {
-    private Integer Id;
+    private Integer id;
     private String sceneNum;
     private List<String> sceneCodes;
 

src/main/java/com/fdkankan/manage/service/impl/CommonServiceImpl.java

@@ -147,7 +147,7 @@ public class CommonServiceImpl implements ICommonService {
             throw new BusinessException(ResultCode.FILE_TYPE_ERROR2);
         }
         CommonUpload commonUpload = commonUploadService.add(tempFile.getName().replace(extName, ""),url, String.valueOf(tempFile.getTotalSpace()),
-                null, fileTypeEnum.getMsg(), extName.replace(".", ""),0,unzipPath);
+                null, fileTypeEnum.getMsg(), modelFileFormat,0,unzipPath);
 
         return ResultData.ok(commonUpload);
     }

src/main/java/com/fdkankan/manage/util/FileWriterUtil.java

@@ -79,6 +79,9 @@ public class FileWriterUtil {
                 if(FileTypeEnum.MODEL.getTypeList().contains(fileName)){
                     fileList.add(file1);
                 }
+                if(FileTypeEnum.OTHER.getTypeList().contains(fileName)){
+                    fileList.add(file1);
+                }
             }else {
                 getCanRunList(fileList,file1);
             }