From 4c882f00d9ee90d43a1c330683a612063ce64f04 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 11 四月 2023 11:13:45 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/show/DataLibController.java |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/show/DataLibController.java b/src/main/java/com/lf/server/controller/show/DataLibController.java
index 212b940..85a0414 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -165,28 +165,23 @@
     })
     @ResponseBody
     @PostMapping(value = "/downloadReq")
-    public ResponseMsg<Object> downloadReq(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
+    public ResponseMsg<Object> downloadReq(@RequestBody DownloadReqEntity dr, HttpServletRequest req, HttpServletResponse res) {
         try {
-            if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
+            if (null == dr || StringHelper.isEmpty(dr.getPwd())) {
                 return fail("瀵嗙爜涓嶈兘涓虹┖");
             }
-            if (null == reqEntity.getIds() || reqEntity.getIds().isEmpty()) {
+            if (null == dr.getIds() || dr.getIds().isEmpty()) {
                 return fail("璇烽�夋嫨瑕佷笅杞界殑鏂囦欢");
             }
-            if (!DownloadService.decryptPwd(reqEntity)) {
+            if (!DownloadService.decryptPwd(dr)) {
                 return fail("瀵嗙爜瑙e瘑澶辫触", null);
             }
-            if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
+            if (StringHelper.isPwdInvalid(dr.getPwd())) {
                 return fail("瀵嗙爜涓嶇鍚堣姹�");
             }
 
-            List<MetaEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
-            if (null == list || list.isEmpty()) {
-                return fail("娌℃湁鎵惧埌鍏冩暟鎹�");
-            }
-
             UserEntity ue = tokenService.getCurrentUser(req);
-            String guid = downloadService.zipFiles(ue, list, reqEntity.getPwd());
+            String guid = metaService.downloadMeteReq(ue, dr);
 
             return success(guid);
         } catch (Exception ex) {

--
Gitblit v1.9.3