From 8d956b3cfdbe928801e68027a43d16d6c5bc46ca Mon Sep 17 00:00:00 2001
From: GYJ <1157756119@qq.com>
Date: Thu, 13 Jun 2024 18:32:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=BE=93=E5=87=BA=EF=BC=8C?=
 =?UTF-8?q?=E6=B6=88=E9=99=A4=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/TbDeviceStockController.java           | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbDeviceStockController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbDeviceStockController.java
index 446baaa0..31d9c628 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbDeviceStockController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbDeviceStockController.java
@@ -1,6 +1,5 @@
 package cn.ysk.cashier.controller.shop;
 
-import cn.hutool.core.util.ZipUtil;
 import cn.ysk.cashier.dto.shop.TbDeviceStockDownloadDto;
 import cn.ysk.cashier.dto.shop.TbShopInfoDto;
 import cn.ysk.cashier.pojo.TbDeviceStock;
@@ -14,7 +13,6 @@ import cn.ysk.cashier.utils.ZipUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -90,14 +88,19 @@ public class TbDeviceStockController {
 
         String baseUrl = "https://kysh.sxczgkj.cn/codeplate?code=";
         File codeImgFileSaveDir = new File(basePath);
+        boolean deleteFlag = false;
         if (codeImgFileSaveDir.exists()) {
             // 先删除内部的文件
             File[] files = codeImgFileSaveDir.listFiles();
-            for (File file : files) {
-                file.delete();
+            if (files != null) {
+                for (File file : files) {
+                    deleteFlag = file.delete();
+                }
+                System.out.println("删除文件结果：" + deleteFlag);
             }
+
             // 删除文件夹
-            codeImgFileSaveDir.delete();
+            deleteFlag = codeImgFileSaveDir.delete();
         }
         for (TbDeviceStock stock : list) {
             // 生成二维码
@@ -108,10 +111,10 @@ public class TbDeviceStockController {
             String zipPath = basePath + ".zip";
             File zipFile = new File(zipPath);
             if (zipFile.exists()) {
-                zipFile.delete();
+                deleteFlag = zipFile.delete();
             }
+            System.out.println("删除文件结果：" + deleteFlag);
             ZipUtils.zipDirectory(codeImgFileSaveDir, zipFile);
-            System.out.println(basePath + ".zip");
 
             FileUtil.downloadFile(request, response, zipFile, true);
         } catch (Exception e) {