From 71b9f6ee58dec62f8f90704cab365f55e36ae99c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 29 十一月 2022 10:53:17 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/lf/server/service/all/BaseUploadService.java b/src/main/java/com/lf/server/service/all/BaseUploadService.java
index bb0d6b1..6edd901 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -7,6 +7,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
@@ -22,23 +23,17 @@
* 鐖朵笂浼犳湇鍔�
* @author WWW
*/
+@Service
public class BaseUploadService {
@Autowired
- PathHelper pathHelper;
+ public PathHelper pathHelper;
- private final Log log = LogFactory.getLog(getClass());
-
- /**
- * 鏌ヨ鐩綍
- */
- public String selectPath() {
- return pathHelper.getTempPathName();
- }
+ public final Log log = LogFactory.getLog(getClass());
/**
* 鏌ヨ鏂囦欢
*/
- public List<MetaFileEntity> selectFiles(String subPath) throws IOException {
+ public List<MetaFileEntity> selectFiles(String subPath, List<String> extList) throws IOException {
String root = pathHelper.getConfig().getTempPath() + File.separator + subPath;
File file = new File(root);
@@ -53,6 +48,13 @@
List<MetaFileEntity> list = new ArrayList<MetaFileEntity>();
for (File f : files) {
String fileName = FileHelper.getFileName(f.getPath());
+ if (null != extList) {
+ String extName = FileHelper.getExtension(fileName);
+ if (!extList.contains(extName)) {
+ continue;
+ }
+ }
+
double sizes = FileHelper.sizeToMb(f.length());
String filePath = subPath + File.separator + fileName;
@@ -66,6 +68,13 @@
}
return list;
+ }
+
+ /**
+ * 鏌ヨ鐩綍
+ */
+ public String selectPath() {
+ return pathHelper.getTempPathName();
}
/**
@@ -148,15 +157,6 @@
}
return list;
- }
-
- /**
- * 鑷悊瀹炰綋闆嗗悎
- */
- public void dealEntities(List<MetaFileEntity> list) {
- for (MetaFileEntity entity : list) {
- entity.setPath(FileHelper.getRelativePath(entity.getPath()));
- }
}
/**
--
Gitblit v1.9.3