From efb9455b7f2a41ca162164de20649e47a8b6ee36 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 03 八月 2022 11:47:24 +0800
Subject: [PATCH] 产品下载后需要删除文件夹和压缩包

---
 src/main/java/com/whyc/service/ProductBomService.java |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/whyc/service/ProductBomService.java b/src/main/java/com/whyc/service/ProductBomService.java
index 7195160..67e8952 100644
--- a/src/main/java/com/whyc/service/ProductBomService.java
+++ b/src/main/java/com/whyc/service/ProductBomService.java
@@ -60,7 +60,7 @@
                 String picUrl=pictureUrls.get(i);
                 pictureName+=picUrl.substring(picUrl.lastIndexOf("\\")+1)+",";
                 File sourceFile=new File(fileDirName+ File.separator+picUrl);
-                copyFile(sourceFile,rootFace,i);
+                copyFile(sourceFile,rootFace);
             }
         }
         String timeStr= ActionUtil.sdfwithFTP.format(new Date());
@@ -83,6 +83,7 @@
             in.close();
             out.close();
             file.delete();//鍒犻櫎鍘嬬缉鏂囦欢
+            ZipUtils.delDir(rootFace);
         } catch (FileNotFoundException | UnsupportedEncodingException e) {
             e.printStackTrace();
         } catch (IOException e) {
@@ -151,16 +152,16 @@
     }
 
     //灏嗛�変腑鐨勬枃浠跺瓨鍏ユ寚瀹氱洰褰曚笅
-    public void copyFile(File source,String dest,int i ){
+    public void copyFile(File source,String dest ){
         //鍒涘缓鐩殑鍦版枃浠跺す
         File destfile = new File(dest);
         if(!destfile.exists()) {
             destfile.mkdir();
-        }else{
+        }/*else{
             if(i==0){
                 ZipUtils.delDir(dest);
             }
-        }
+        }*/
         //source鏄枃浠讹紝鍒欑敤瀛楄妭杈撳叆杈撳嚭娴佸鍒舵枃浠�
         try {
             if(source.isFile()){
@@ -213,12 +214,12 @@
         wrapper.eq("parent_model",parentModel);
         List<ProductBom> list=mapper.selectList(wrapper);
         //鐢熸垚excel骞跺皢dwg鏂囦欢鏀惧湪鍚屼竴鎶ヤ笅鍘嬬缉
-        creatBomExcel(req,resp,list,wb,parentModel);
+        creatBomExcel(req,resp,list,wb);
     }
     //鏍规嵁浜у搧淇℃伅鍒涘缓excel琛ㄦ牸骞跺瓨鏀惧湪鎸囧畾鐩綍
-    public void creatBomExcel(HttpServletRequest req, HttpServletResponse resp,List<ProductBom> list, HSSFWorkbook wb, String parentModel){
+    public void creatBomExcel(HttpServletRequest req, HttpServletResponse resp,List<ProductBom> list, HSSFWorkbook wb){
         String fileDirName = FileDirPath.getFileDirName();
-        String rootFace=fileDirName+ File.separator+parentModel;
+        String rootFace="";
         String pictureName="";
         String excelName="";
         //鍒涘缓鍗曚釜sheet
@@ -249,11 +250,18 @@
             for (int i=0;i<list.size();i++) {
                 ProductBom bom=list.get(i);
                 String dwgUrl=bom.getDwgUrl();
-                excelName=bom.getParentCode();
+                if(i==0){
+                    excelName=bom.getParentCode();
+                    rootFace=fileDirName+File.separator+excelName;
+                    File destfile = new File(rootFace);
+                    if(!destfile.exists()) {
+                        destfile.mkdir();
+                    }
+                }
                 if((dwgUrl!=null)&&(!dwgUrl.isEmpty())){
                     pictureName+=dwgUrl.substring(dwgUrl.lastIndexOf("\\")+1)+",";
                     File sourceFile=new File(fileDirName+ File.separator+dwgUrl);
-                    copyFile(sourceFile,rootFace,i);
+                    copyFile(sourceFile,rootFace);
                 }
                 Row row=sheet.createRow(rownum+i+1);
                 row.setHeight((short)(1500));
@@ -332,11 +340,11 @@
             in.close();
             out.close();
             file.delete();
+            ZipUtils.delDir(rootFace);
         } catch (FileNotFoundException | UnsupportedEncodingException e) {
             e.printStackTrace();
         } catch (IOException e) {
             e.printStackTrace();
         }
     }
-
 }

--
Gitblit v1.9.1