文件上传大小限制

ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java

@@ -88,6 +88,8 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
     private static String SW_FILE_NUM_EXAMPLE="^\\w+-[0-9]{4}-\\w+-[0-9]+";
     private static String ZX_FILE_NUM_EXAMPLE="^ZX[0-9]{4}-\\w+-[0-9]+";
     private static String ZX_FILE_NUM_SECOND_EXAMPLE="^Z+-[0-9]{2}+-[0-9]{0,2}+-[0-9]{1,3}+";
+    private static String ZX_FILE_NUM_THIRD_EXAMPLE="^Z+-[0-9]{2}+-[0-9]{1,3}+";
+
     private static String NJ_FILE_NUM_EXAMPLE="^NJ[0-9]{4}-[0-9]+";
     private static String ZXXM_FILE_NUM_EXAMPLE="^ZXXM[0-9]+-[0-9]+-[0-9]+";
     private static String ZXXM_SECOND_FILE_NUM_EXAMPLE="^KJ[0-9]+-[0-9]+-[0-9]+";
@@ -1180,7 +1182,9 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
             //校验数据
             String fileNum =item.getFileNum().trim();
             //校验档号
-            boolean flag = fileNum.matches(ZX_FILE_NUM_EXAMPLE)||fileNum.matches(ZX_FILE_NUM_SECOND_EXAMPLE);
+            boolean flag = fileNum.matches(ZX_FILE_NUM_EXAMPLE)
+                    ||fileNum.matches(ZX_FILE_NUM_SECOND_EXAMPLE)
+                    ||fileNum.matches(ZX_FILE_NUM_THIRD_EXAMPLE);
             if (Boolean.FALSE==flag){
                 throw  new RuntimeException("["+file.getOriginalFilename()+"——Sheet:1——行号" + (i + 3) + "]档号不符合标准,请检查后提交");
             }
@@ -1195,7 +1199,7 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
             }
             archiveRecordInfo.setCaseNum(fileNum.substring(fileNum.lastIndexOf("-")+1));
             archiveRecordInfo.setArchiveCategory(type);
-            if (fileNum.matches(ZX_FILE_NUM_SECOND_EXAMPLE)) {
+            if (fileNum.matches(ZX_FILE_NUM_SECOND_EXAMPLE) || fileNum.matches(ZX_FILE_NUM_THIRD_EXAMPLE)) {
                 String year = fileNum.split("-")[1];
                 if (year.startsWith("9")){
                     year="19"+year;

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

@@ -23,9 +23,9 @@ import com.ruoyi.common.utils.uuid.IdUtils;
 public class FileUploadUtils
 {
     /**
-     * 默认大小 200M
+     * 默认大小 2G
      */
-    public static final long DEFAULT_MAX_SIZE = 200 * 1024 * 1024;
+    public static final long DEFAULT_MAX_SIZE = 2L * 1024 * 1024 * 1024;
 
     /**
      * 默认的文件名最大长度 300