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/sys/ResController.java | 52 +++++++++++++++++++++++++++++++++------------------- 1 files changed, 33 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/lf/server/controller/sys/ResController.java b/src/main/java/com/lf/server/controller/sys/ResController.java index acafac1..a763bc1 100644 --- a/src/main/java/com/lf/server/controller/sys/ResController.java +++ b/src/main/java/com/lf/server/controller/sys/ResController.java @@ -1,12 +1,13 @@ package com.lf.server.controller.sys; -import com.lf.server.aspect.SysLog; +import com.lf.server.annotation.SysLog; import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.sys.ResEntity; import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.all.PermsService; -import com.lf.server.service.all.UploadService; +import com.lf.server.service.all.UploadAttachService; +import com.lf.server.service.data.DownloadService; import com.lf.server.service.sys.ResService; import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; @@ -37,12 +38,15 @@ TokenService tokenService; @Autowired - UploadService uploadService; - - @Autowired PermsService permsService; - private final static String TAB_NAME = "sys_res"; + @Autowired + DownloadService downloadService; + + @Autowired + UploadAttachService uploadAttachService; + + private final static String TAB_NAME = "lf.sys_res"; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -56,7 +60,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -78,7 +82,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -103,7 +107,7 @@ List<ResEntity> rs = resService.selectByPage(name, pageSize, pageSize * (pageIndex - 1)); return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -130,7 +134,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -154,7 +158,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -180,7 +184,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -199,7 +203,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -222,7 +226,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -247,7 +251,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -263,7 +267,7 @@ return success(resEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -276,7 +280,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -287,7 +291,7 @@ public ResponseMsg<String> upload(@RequestParam("file") MultipartFile file, HttpServletRequest req) { UserEntity ue = tokenService.getCurrentUser(req); - return uploadService.upload(ue, TAB_NAME, file, this); + return uploadAttachService.upload(ue, TAB_NAME, file, this); } @SysLog() @@ -297,6 +301,16 @@ }) @GetMapping(value = "/download") public void download(String guid, HttpServletResponse res) { - uploadService.download(guid, res); + uploadAttachService.download(guid, false, res); + } + + @SysLog() + @ApiOperation(value = "鏌ョ湅鏂囦欢") + @ApiImplicitParams({ + @ApiImplicitParam(name = "guid", value = "闄勪欢Guid", dataType = "String", paramType = "body") + }) + @GetMapping(value = "/downloadForView") + public void downloadForView(String guid, HttpServletResponse res) { + uploadAttachService.download(guid, true, res); } } -- Gitblit v1.9.3