From c8bcfd9b7dc277e212468b947b5c0b757177170c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 15:07:45 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 bd4f342..c5da217 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,7 @@
package com.lf.server.service.all;
import com.lf.server.entity.data.MetaEntity;
+import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.helper.FileHelper;
import com.lf.server.helper.PathHelper;
import com.lf.server.helper.StringHelper;
@@ -80,7 +81,7 @@
/**
* 涓婁紶鏂囦欢
*/
- public <T> List<MetaEntity> uploadData(T t, String path, HttpServletRequest req, HttpServletResponse res) throws Exception {
+ public <T> List<MetaFileEntity> 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");
@@ -88,9 +89,8 @@
if (t != null) {
setEntity(t, request);
}
- List<MetaEntity> list = getFiles(path, request);
- return list;
+ return getFiles(path, request);
}
/**
@@ -133,20 +133,21 @@
/**
* 鑾峰彇鏂囦欢
*/
- public List<MetaEntity> getFiles(String subPath, StandardMultipartHttpServletRequest req) throws Exception {
- List<MetaEntity> list = new ArrayList<MetaEntity>();
+ public List<MetaFileEntity> getFiles(String subPath, StandardMultipartHttpServletRequest req) throws Exception {
+ List<MetaFileEntity> list = new ArrayList<>();
String path = pathHelper.getTempPath(subPath);
Iterator<String> iterator = req.getFileNames();
while (iterator.hasNext()) {
MultipartFile file = req.getFile(iterator.next());
- if (StringHelper.isEmpty(file.getOriginalFilename())) {
+ if (null == file || StringHelper.isEmpty(file.getOriginalFilename())) {
continue;
}
- double sizes = FileHelper.sizeToMb(file.getSize());
- MetaEntity mf = new MetaEntity();
+ MetaFileEntity mf = new MetaFileEntity();
mf.setName(file.getOriginalFilename());
+
+ double sizes = FileHelper.sizeToMb(file.getSize());
mf.setSizes(sizes);
mf.setPath(path + File.separator + mf.getName());
--
Gitblit v1.9.3