From 3e9af5853d728258ab474f345ce2145fb8c21548 Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Wed, 6 Nov 2024 10:06:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gj_erp/controller/jcsj/BomUploadController.java   |  8 +++++---
 .../service/jcsj/impl/BomUploadServiceImpl.java       |  8 ++++++++
 src/main/java/com/dsic/gj_erp/util/MyFileUtil.java    | 11 +++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java
index 04a018b..0052d7b 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java
@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -59,7 +60,7 @@ public class BomUploadController {
     @ResponseBody
     public ResultBean uploadPl(@RequestParam("file") MultipartFile[] file ,@RequestParam("tltList") MultipartFile[] tltList , String czbh,String pl, String isupload, HttpServletRequest req) throws Exception, CustomException {
         String date=DateUtil.date().toString("yyyyMMdd");
-        String path="/"+czbh+"_"+pl+"/"+date+"/ERP";
+        String path="/"+czbh+"/"+pl+"/ERP";
         ResultBean bean= bomUploadService.uploadZ( file ,  czbh,  pl,isupload,  req,path);
         Map map =(Map)bean.getData();
         if(map.get("zt").equals("01")){
@@ -76,18 +77,19 @@ public class BomUploadController {
     @Transactional
     public boolean uploadPDF(MultipartFile[] fileList, String dcCh,String pl,String date)throws IOException {
         List<Dm_zhbmp> kwxxs = dm_zhbmpRepository.findByBMLB("KWXX");
+         //
 
         Map<String, String> kwxxMap = kwxxs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm));
         for (MultipartFile file : fileList) {//船号_批量/日期/PDF（ERP）
             if(file.getOriginalFilename().contains(".QG")){
                 String s = kwxxMap.get(file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("/")+1).substring(4, 7));
-                String url= com.dsic.gj_erp.util.FileUtil.handlerUpload(file,"/"+dcCh+"_"+pl+"/"+date+"/QG"+"/"+s);
+                String url= com.dsic.gj_erp.util.FileUtil.handlerUpload(file,"/"+dcCh+"/"+pl+"/QG"+"/"+s);
 
                 bomMapper.insertFile(url,"");
             }else if (file.getOriginalFilename().contains(".pdf")){
 
 
-            String url= com.dsic.gj_erp.util.FileUtil.handlerUpload(file,"/"+dcCh+"_"+pl+"/"+date+"/PDF");
+            String url= com.dsic.gj_erp.util.FileUtil.handlerUpload(file,"/"+dcCh+"/"+pl+"/PDF");
 //            PDDocument document = PDDocument.load(file.getInputStream());
 //            int pageNum = document.getNumberOfPages();
 //            PDFTextStripper stripper = new PDFTextStripper();
diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
index c5e1f25..061367f 100644
--- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
@@ -20,6 +20,7 @@ import com.dsic.gj_erp.service.jcsj.*;
 import com.dsic.gj_erp.service.jhgk.DmTzjhService;
 import com.dsic.gj_erp.service.jhgk.DmYdjhService;
 import com.dsic.gj_erp.service.sy.SYService;
+import com.dsic.gj_erp.util.MyFileUtil;
 import com.dsic.gj_erp.util.ObjConvertUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -138,6 +139,13 @@ public class BomUploadServiceImpl {
             }
         } else {
         }
+        File folder = new File("/"+czbh+"/"+pl);
+
+        // Check if the directory exists
+        if (folder.exists()) {
+            // Delete the directory and its contents
+           MyFileUtil.deleteDirectory(folder);
+        }
         boolean fbom = false;
         Integer cs = null;
         for (MultipartFile f : file) {
diff --git a/src/main/java/com/dsic/gj_erp/util/MyFileUtil.java b/src/main/java/com/dsic/gj_erp/util/MyFileUtil.java
index bcf481d..56f9d35 100644
--- a/src/main/java/com/dsic/gj_erp/util/MyFileUtil.java
+++ b/src/main/java/com/dsic/gj_erp/util/MyFileUtil.java
@@ -35,4 +35,15 @@ public class MyFileUtil {
         // 删除空文件夹
         return folder.delete();
     }
+    public static void deleteDirectory(File folder) {
+        if (folder.isDirectory()) {
+            File[] files = folder.listFiles();
+            if (files != null) {
+                for (File file : files) {
+                    deleteDirectory(file);
+                }
+            }
+        }
+        folder.delete(); // Delete empty directory or file
+    }
 }