From 06fbda53248c3e4dfdb09db2bc05a957f918bfd9 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 07 十一月 2022 11:20:02 +0800
Subject: [PATCH] 修复sheet超出最大行数异常问题
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index 1a89dd9..4652a29 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -2,6 +2,7 @@
import java.io.File;
import java.io.IOException;
+import java.nio.file.Paths;
import java.util.Objects;
import org.apache.commons.io.FilenameUtils;
import org.springframework.web.multipart.MultipartFile;
@@ -12,7 +13,7 @@
import com.ruoyi.common.exception.file.InvalidExtensionException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.common.utils.uuid.Seq;
/**
* 文件上传工具类
@@ -111,8 +112,8 @@
String fileName = extractFilename(file);
- File desc = getAbsoluteFile(baseDir, fileName);
- file.transferTo(desc);
+ String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
+ file.transferTo(Paths.get(absPath));
return getPathFileName(baseDir, fileName);
}
@@ -121,7 +122,8 @@
*/
public static final String extractFilename(MultipartFile file)
{
- return DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + getExtension(file);
+ return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
+ FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));
}
public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
@@ -191,7 +193,6 @@
throw new InvalidExtensionException(allowedExtension, extension, fileName);
}
}
-
}
/**
--
Gitblit v1.9.2