From 05b7f36c1fdb1dae4fd2131f63e10f72f85ee42c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 03 四月 2023 16:49:14 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/MetaController.java | 49 +++++++++++++++++++++----------------------------
1 files changed, 21 insertions(+), 28 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 6a99062..813d753 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -41,7 +41,7 @@
* 鍏冩暟鎹�
* @author WWW
*/
-@Api(tags = "鏁版嵁绠＄悊\\鍏冩暟鎹鐞�")
+@Api(tags = "鏁版嵁绠＄悊\\淇℃伅绠＄悊")
@RestController
@RequestMapping("/meta")
public class MetaController extends BaseController {
@@ -193,7 +193,7 @@
wrapper.eq("parentid", meta.getEventid());
Page<Object> page = new Page<>(pageIndex, pageSize);
- page.addOrder(OrderItem.asc("gid"));
+ page.addOrder(OrderItem.desc("gid"));
IPage<Object> paged = baseMapper.selectPage(page, wrapper);
return success(paged.getTotal(), paged.getRecords());
@@ -269,25 +269,9 @@
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎涓�鏉�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
- })
- @GetMapping(value = "/delete")
- public ResponseMsg<Integer> delete(int id) {
- try {
- int count = metaService.delete(id);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex, -1);
- }
- }
-
- @SysLog()
@ApiOperation(value = "鍒犻櫎澶氭潯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1,2")
+ @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", allowMultiple = true, example = "1")
})
@GetMapping(value = "/deletes")
public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids) {
@@ -384,33 +368,32 @@
@SysLog()
@ApiOperation(value = "璇锋眰涓嬭浇")
@ApiImplicitParams({
- @ApiImplicitParam(name = "pwd", value = "瀵嗙爜", dataType = "String", paramType = "body", example = ""),
- @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "body", example = "1,2")
+ @ApiImplicitParam(name = "dr", value = "璇锋眰涓嬭浇瀹炰綋绫�", dataType = "DownloadReqEntity", paramType = "body")
})
@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("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
- if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
+ if (StringHelper.isPwdInvalid(dr.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
- List<MetaEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
+ 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, reqEntity.getPwd());
+ String guid = downloadService.zipFiles(ue, list, dr.getPwd());
return success(guid);
} catch (Exception ex) {
@@ -496,4 +479,14 @@
WebHelper.writeInfo(HttpStatus.ERROR, ex.getMessage(), res);
}
}
+
+ @SysLog()
+ @ApiOperation(value = "鏌ョ湅鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "guid", value = "闄勪欢Guid", dataType = "String", paramType = "body")
+ })
+ @GetMapping(value = "/downloadForView")
+ public void downloadForView(String guid, HttpServletResponse res) {
+ metaService.downloadForView(guid, true, res);
+ }
}
--
Gitblit v1.9.3