From ac20dc99bf1f463365dba071973e08fffbd294b4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 14 七月 2023 14:12:21 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/MetaController.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index d36dead..c565155 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -356,11 +356,11 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- int count = downloadService.selectCountForUser(ue.getId(), 3, name);
+ int count = downloadService.selectCountForUser(ue.getId(), "3,4", name);
if (count == 0) {
return success(0, null);
}
- List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), 3, name, pageSize, pageSize * (pageIndex - 1));
+ List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), "3,4", name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
@@ -415,7 +415,7 @@
}
@SysLog()
- @ApiOperation(value = "璇锋眰涓嬭浇")
+ @ApiOperation(value = "璇锋眰鍏冩暟鎹笅杞�")
@ApiImplicitParams({
@ApiImplicitParam(name = "dr", value = "璇锋眰涓嬭浇瀹炰綋绫�", dataType = "DownloadReqEntity", paramType = "body")
})
@@ -436,13 +436,8 @@
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
- List<MetaEntity> list = metaService.selectMetaFiles(dr.getIds());
- if (null == list || list.isEmpty()) {
- return fail("娌℃湁鎵惧埌鍏冩暟鎹�");
- }
-
UserEntity ue = tokenService.getCurrentUser(req);
- String guid = downloadService.zipFiles(ue, list, dr.getPwd());
+ String guid = metaService.downloadMeteReq(ue, dr);
return success(guid);
} catch (Exception ex) {
--
Gitblit v1.9.3