From bf9f5d506d34cbbcc68f77cdf71e30a6cf3cd7d4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 09 八月 2023 13:50:07 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/data/DirController.java |   42 ++++++++++++++++++++++++------------------
 1 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/data/DirController.java b/src/main/java/com/lf/server/controller/data/DirController.java
index 2883279..45f0410 100644
--- a/src/main/java/com/lf/server/controller/data/DirController.java
+++ b/src/main/java/com/lf/server/controller/data/DirController.java
@@ -5,7 +5,7 @@
 import com.lf.server.entity.all.ResponseMsg;
 import com.lf.server.entity.data.DirEntity;
 import com.lf.server.entity.sys.UserEntity;
-import com.lf.server.helper.StringHelper;
+import com.lf.server.helper.WebHelper;
 import com.lf.server.service.data.DirService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
@@ -16,6 +16,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -50,7 +51,7 @@
 
             return success(entity.getId());
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -71,7 +72,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -87,7 +88,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -107,7 +108,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -129,7 +130,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -153,7 +154,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -169,7 +170,7 @@
 
             return success(dirEntity);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -181,26 +182,31 @@
             List<DirEntity> list = dirService.selectDirAll();
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
     @SysLog()
-    @ApiOperation(value = "閫掑綊鏌ヨ")
+    @ApiOperation(value = "涓嬭浇鐩綍缁撴瀯")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "name", value = "鐩綍鍚嶇О", dataType = "String", paramType = "query", required = false, example = "涓縿涓滅嚎绠￠亾宸ョ▼鍗楁")
+            @ApiImplicitParam(name = "id", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1")
     })
-    @GetMapping(value = "/selectDirRecursive")
-    public ResponseMsg<List<DirEntity>> selectDirRecursive(String name) {
+    @GetMapping(value = "/downloadDir")
+    public void downloadDir(int id, HttpServletResponse res) {
         try {
-            if (StringHelper.isEmpty(name)) {
-                name = "涓縿涓滅嚎绠￠亾宸ョ▼鍗楁";
+            DirEntity entity = dirService.selectDir(id);
+            if (null == entity || entity.getPid() > 0) {
+                return;
             }
-            List<DirEntity> list = dirService.selectDirRecursive(name);
 
-            return success(list);
+            String zipFile = dirService.createDirs(id);
+            if (null == zipFile) {
+                return;
+            }
+
+            WebHelper.download(zipFile, entity.getName() + ".zip", res);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            log.error(ex.getMessage(), ex);
         }
     }
 }

--
Gitblit v1.9.3