From 65b7935caa01d5bc3e80066eab9576d329a5867d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 14:16:07 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 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 0e98187..bd4f342 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -1,6 +1,6 @@
package com.lf.server.service.all;
-import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.MetaEntity;
import com.lf.server.helper.FileHelper;
import com.lf.server.helper.PathHelper;
import com.lf.server.helper.StringHelper;
@@ -31,16 +31,9 @@
public final Log log = LogFactory.getLog(getClass());
/**
- * 鏌ヨ鐩綍
- */
- public String selectPath() {
- return pathHelper.getTempPathName();
- }
-
- /**
* 鏌ヨ鏂囦欢
*/
- public List<MetaFileEntity> selectFiles(String subPath) throws IOException {
+ public List<MetaEntity> selectFiles(String subPath, List<String> extList) throws IOException {
String root = pathHelper.getConfig().getTempPath() + File.separator + subPath;
File file = new File(root);
@@ -52,13 +45,20 @@
return null;
}
- List<MetaFileEntity> list = new ArrayList<MetaFileEntity>();
+ List<MetaEntity> list = new ArrayList<MetaEntity>();
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;
- MetaFileEntity mf = new MetaFileEntity();
+ MetaEntity mf = new MetaEntity();
mf.setName(fileName);
mf.setSizes(sizes);
mf.setPath(filePath);
@@ -71,9 +71,16 @@
}
/**
+ * 鏌ヨ鐩綍
+ */
+ public String selectPath() {
+ return pathHelper.getTempPathName();
+ }
+
+ /**
* 涓婁紶鏂囦欢
*/
- public <T> List<MetaFileEntity> uploadData(T t, String path, HttpServletRequest req, HttpServletResponse res) throws Exception {
+ public <T> List<MetaEntity> uploadData(T t, String path, HttpServletRequest req, HttpServletResponse res) throws Exception {
StandardMultipartHttpServletRequest request = (StandardMultipartHttpServletRequest) req;
req.setCharacterEncoding("utf-8");
res.setContentType("application/json;charset=utf-8");
@@ -81,7 +88,7 @@
if (t != null) {
setEntity(t, request);
}
- List<MetaFileEntity> list = getFiles(path, request);
+ List<MetaEntity> list = getFiles(path, request);
return list;
}
@@ -126,8 +133,8 @@
/**
* 鑾峰彇鏂囦欢
*/
- public List<MetaFileEntity> getFiles(String subPath, StandardMultipartHttpServletRequest req) throws Exception {
- List<MetaFileEntity> list = new ArrayList<MetaFileEntity>();
+ public List<MetaEntity> getFiles(String subPath, StandardMultipartHttpServletRequest req) throws Exception {
+ List<MetaEntity> list = new ArrayList<MetaEntity>();
String path = pathHelper.getTempPath(subPath);
Iterator<String> iterator = req.getFileNames();
@@ -138,7 +145,7 @@
}
double sizes = FileHelper.sizeToMb(file.getSize());
- MetaFileEntity mf = new MetaFileEntity();
+ MetaEntity mf = new MetaEntity();
mf.setName(file.getOriginalFilename());
mf.setSizes(sizes);
mf.setPath(path + File.separator + mf.getName());
@@ -155,11 +162,11 @@
/**
* 鍒犻櫎鏂囦欢
*/
- public Integer deleteFiles(List<MetaFileEntity> list) {
+ public Integer deleteFiles(List<MetaEntity> list) {
String root = pathHelper.getConfig().getTempPath();
int count = 0;
- for (MetaFileEntity entity : list) {
+ for (MetaEntity entity : list) {
if (!StringHelper.isEmpty(entity.getPath())) {
String file = root + File.separator + entity.getPath();
--
Gitblit v1.9.3