From bec992c853339f1b2cd38d4cda5602d29caed6ae Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 01 十二月 2023 09:29:56 +0800
Subject: [PATCH] bom反馈附件路径逻辑更新

---
 src/main/java/com/whyc/service/BOMFeedbakService.java |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/whyc/service/BOMFeedbakService.java b/src/main/java/com/whyc/service/BOMFeedbakService.java
index a08d6a2..1173104 100644
--- a/src/main/java/com/whyc/service/BOMFeedbakService.java
+++ b/src/main/java/com/whyc/service/BOMFeedbakService.java
@@ -8,7 +8,6 @@
 import com.whyc.dto.FileDirPath;
 import com.whyc.dto.MailDTO;
 import com.whyc.dto.Response;
-import com.whyc.dto.ZipUtils;
 import com.whyc.mapper.BOMFeedbakMapper;
 import com.whyc.mapper.DocUserMapper;
 import com.whyc.mapper.ProductHistoryMapper;
@@ -198,9 +197,15 @@
         //鍘嬬缉鍖呯殑璺緞鍙婃牸寮忎负: doc_file/feedback_bom/username_time.zip
         String username = ActionUtil.getUser().getName();
         long time = date.getTime();
-        String feedbackZipPath = "feedback_bom" + File.separator + username + "_" + time+".zip";
-        List<File> fileList = new LinkedList<>();
+        //String feedbackZipPath = "feedback_bom" + File.separator + username + "_" + time+".zip";
+        //List<File> fileList = new LinkedList<>();
         String rootFile = CommonUtil.getRootFile();
+        String feedbackDirSuffix = "feedback_bom" + File.separator + username + File.separator + time + File.separator;
+        String feedbackDir = rootFile + feedbackDirSuffix;
+        File fileDir = new File(feedbackDir);
+        if (!fileDir.exists()) {
+            fileDir.mkdirs();
+        }
         if(multipartFileList!=null && multipartFileList.size()!=0){
             for (int i = 0; i < multipartFileList.size(); i++) {
                 MultipartFile multipartFile = multipartFileList.get(i);
@@ -209,21 +214,19 @@
                 String originalFilename = multipartFile.getOriginalFilename();
                 String fileName = originalFilename.substring(0, originalFilename.lastIndexOf("."));
                 String suffix = originalFilename.substring(originalFilename.lastIndexOf("."));
-                String feedbackPath = "feedback_bom" + File.separator + fileName + "_" + time + suffix;
-                File file = new File(rootFile + feedbackPath);
-                if (!file.exists()) {
-                    file.mkdirs();
-                }
+                String feedbackPath = feedbackDir + fileName + suffix;
+                File file = new File(feedbackPath);
+
                 multipartFile.transferTo(file);
-                fileList.add(file);
+                //fileList.add(file);
             }
-            ZipUtils.toZip(fileList,new FileOutputStream(new File(rootFile+feedbackZipPath)));
-            feedback.setFile("doc_file" + File.separator + feedbackZipPath);
+            //ZipUtils.toZip(fileList,new FileOutputStream(new File(rootFile+feedbackZipPath)));
+            feedback.setFile("doc_file" + File.separator + feedbackDirSuffix);
         }
         //鍒犻櫎宸茬粡琚帇缂╃殑鏂囦欢
-        for (File file : fileList) {
-            file.delete();
-        }
+        //for (File file : fileList) {
+        //    file.delete();
+        //}
         //淇濆瓨
         feedback.setCreateTime(date);
         feedback.setConfirmStatus(0);

--
Gitblit v1.9.1