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 |   58 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 29 insertions(+), 29 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..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,12 +1,13 @@
 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;
 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<MetaEntity> selectFiles(String subPath, List<String> extList) throws IOException {
         String root = pathHelper.getConfig().getTempPath() + File.separator + subPath;
 
         File file = new File(root);
@@ -50,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);
@@ -69,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");
@@ -79,7 +88,7 @@
         if (t != null) {
             setEntity(t, request);
         }
-        List<MetaFileEntity> list = getFiles(path, request);
+        List<MetaEntity> list = getFiles(path, request);
 
         return list;
     }
@@ -124,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();
@@ -136,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());
@@ -151,22 +160,13 @@
     }
 
     /**
-     * 鑷悊瀹炰綋闆嗗悎
-     */
-    public void dealEntities(List<MetaFileEntity> list) {
-        for (MetaFileEntity entity : list) {
-            entity.setPath(FileHelper.getRelativePath(entity.getPath()));
-        }
-    }
-
-    /**
      * 鍒犻櫎鏂囦欢
      */
-    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