From e4aeeaf6fc665faa0f1e9e71c60609d62a9b093f Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Fri, 21 Nov 2025 17:00:49 +0800
Subject: [PATCH] 修复机场挂载相机无法删除的问题
---
ard-common/src/main/java/com/ard/common/utils/file/FileUploadUtils.java | 124 +++++++++++++++-------------------------
1 files changed, 47 insertions(+), 77 deletions(-)
diff --git a/ard-common/src/main/java/com/ard/common/utils/file/FileUploadUtils.java b/ard-common/src/main/java/com/ard/common/utils/file/FileUploadUtils.java
index f5b7234..e9f892d 100644
--- a/ard-common/src/main/java/com/ard/common/utils/file/FileUploadUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/file/FileUploadUtils.java
@@ -4,8 +4,7 @@
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;
+
import com.ard.common.config.UavConfig;
import com.ard.common.constant.Constants;
import com.ard.common.exception.file.FileNameLengthLimitExceededException;
@@ -14,18 +13,19 @@
import com.ard.common.utils.DateUtils;
import com.ard.common.utils.StringUtils;
import com.ard.common.utils.uuid.Seq;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.web.multipart.MultipartFile;
/**
* 文件上传工具类
*
- * @author ruoyi
+ * @author ard
*/
-public class FileUploadUtils
-{
+public class FileUploadUtils {
/**
* 默认大小 50M
*/
- public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024L;
+ public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
/**
* 默认的文件名最大长度 100
@@ -33,19 +33,19 @@
public static final int DEFAULT_FILE_NAME_LENGTH = 100;
/**
- * 默认上传的地址
+ * 本地默认上传的地址
*/
private static String defaultBaseDir = UavConfig.getProfile();
- public static void setDefaultBaseDir(String defaultBaseDir)
- {
+
+ public static void setDefaultBaseDir(String defaultBaseDir) {
FileUploadUtils.defaultBaseDir = defaultBaseDir;
}
- public static String getDefaultBaseDir()
- {
+ public static String getDefaultBaseDir() {
return defaultBaseDir;
}
+
/**
* 以默认配置进行文件上传
@@ -54,14 +54,10 @@
* @return 文件名称
* @throws Exception
*/
- public static final String upload(MultipartFile file) throws IOException
- {
- try
- {
+ public static final String upload(MultipartFile file) throws IOException {
+ try {
return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
throw new IOException(e.getMessage(), e);
}
}
@@ -70,18 +66,14 @@
* 根据文件路径上传
*
* @param baseDir 相对应用的基目录
- * @param file 上传的文件
+ * @param file 上传的文件
* @return 文件名称
* @throws IOException
*/
- public static final String upload(String baseDir, MultipartFile file) throws IOException
- {
- try
- {
+ public static final String upload(String baseDir, MultipartFile file) throws IOException {
+ try {
return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
throw new IOException(e.getMessage(), e);
}
}
@@ -89,22 +81,20 @@
/**
* 文件上传
*
- * @param baseDir 相对应用的基目录
- * @param file 上传的文件
+ * @param baseDir 相对应用的基目录
+ * @param file 上传的文件
* @param allowedExtension 上传文件类型
* @return 返回上传成功的文件名
- * @throws FileSizeLimitExceededException 如果超出最大大小
+ * @throws FileSizeLimitExceededException 如果超出最大大小
* @throws FileNameLengthLimitExceededException 文件名太长
- * @throws IOException 比如读写文件出错时
- * @throws InvalidExtensionException 文件校验异常
+ * @throws IOException 比如读写文件出错时
+ * @throws InvalidExtensionException 文件校验异常
*/
public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
- InvalidExtensionException
- {
+ InvalidExtensionException {
int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length();
- if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
- {
+ if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) {
throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
}
@@ -117,31 +107,28 @@
return getPathFileName(baseDir, fileName);
}
+
/**
* 编码文件名
*/
- public static final String extractFilename(MultipartFile file)
- {
+ public static final String extractFilename(MultipartFile file) {
return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
- FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));
+ FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType),
+ getExtension(file));
}
- public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
- {
+ public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException {
File desc = new File(uploadDir + File.separator + fileName);
- if (!desc.exists())
- {
- if (!desc.getParentFile().exists())
- {
+ if (!desc.exists()) {
+ if (!desc.getParentFile().exists()) {
desc.getParentFile().mkdirs();
}
}
return desc;
}
- public static final String getPathFileName(String uploadDir, String fileName) throws IOException
- {
+ public static final String getPathFileName(String uploadDir, String fileName) throws IOException {
int dirLastIndex = UavConfig.getProfile().length() + 1;
String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
@@ -156,40 +143,28 @@
* @throws InvalidExtensionException
*/
public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
- throws FileSizeLimitExceededException, InvalidExtensionException
- {
+ throws FileSizeLimitExceededException, InvalidExtensionException {
long size = file.getSize();
- if (size > DEFAULT_MAX_SIZE)
- {
+ if (size > DEFAULT_MAX_SIZE) {
throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
}
String fileName = file.getOriginalFilename();
String extension = getExtension(file);
- if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension))
- {
- if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION)
- {
+ if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) {
+ if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) {
throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
fileName);
- }
- else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION)
- {
+ } else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) {
throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
fileName);
- }
- else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION)
- {
+ } else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) {
throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
fileName);
- }
- else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION)
- {
+ } else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) {
throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
fileName);
- }
- else
- {
+ } else {
throw new InvalidExtensionException(allowedExtension, extension, fileName);
}
}
@@ -202,12 +177,9 @@
* @param allowedExtension
* @return
*/
- public static final boolean isAllowedExtension(String extension, String[] allowedExtension)
- {
- for (String str : allowedExtension)
- {
- if (str.equalsIgnoreCase(extension))
- {
+ public static final boolean isAllowedExtension(String extension, String[] allowedExtension) {
+ for (String str : allowedExtension) {
+ if (str.equalsIgnoreCase(extension)) {
return true;
}
}
@@ -220,13 +192,11 @@
* @param file 表单文件
* @return 后缀名
*/
- public static final String getExtension(MultipartFile file)
- {
+ public static final String getExtension(MultipartFile file) {
String extension = FilenameUtils.getExtension(file.getOriginalFilename());
- if (StringUtils.isEmpty(extension))
- {
+ if (StringUtils.isEmpty(extension)) {
extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType()));
}
return extension;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3