From 2bcbf32c439a5d7fbb20234b86e410347d5b806f Mon Sep 17 00:00:00 2001 From: Jinquan_Ou <Jinquan@gdut.com> Date: 星期六, 15 四月 2023 16:04:48 +0800 Subject: [PATCH] 456 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index 922c03d..6c13276 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -1,11 +1,13 @@ package com.ruoyi.web.controller.common; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.websocket.server.PathParam; +import com.ruoyi.service.DownLoadFileService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -34,6 +36,9 @@ @Autowired private ServerConfig serverConfig; + @Autowired + private DownLoadFileService downLoadFileService; + private static final String FILE_DELIMETER = ","; /** @@ -43,7 +48,7 @@ * @param delete 鏄惁鍒犻櫎 */ @GetMapping("/download") - public void fileDownload(@PathParam("fileName") String fileName,@PathParam("delete") Boolean delete, HttpServletResponse response, HttpServletRequest request) + public void fileDownload(@PathParam("fileName") String fileName, @PathParam("delete") Boolean delete, HttpServletResponse response, HttpServletRequest request) { try { @@ -68,11 +73,17 @@ } } + @GetMapping("/downLoadFile") + public void downLoadFile(@PathParam("path") String path, HttpServletResponse response) throws Exception { + downLoadFileService.downLoadFile(path,response); + } + + /** * 閫氱敤涓婁紶璇锋眰锛堝崟涓級 */ @PostMapping("/upload") - public AjaxResult uploadFile(@RequestParam("uploadFile")MultipartFile file) throws Exception + public AjaxResult uploadFile(@RequestParam("uploadFile") MultipartFile file) throws Exception { try { @@ -83,10 +94,15 @@ String url = serverConfig.getUrl() + fileName; AjaxResult ajax = AjaxResult.success(); - ajax.put("url", url); - ajax.put("fileName", fileName); - ajax.put("newFileName", FileUtils.getName(fileName)); - ajax.put("originalFilename", file.getOriginalFilename()); + + HashMap<String, Object> data = new HashMap<>(); + data.put("url", url); + data.put("fileName", fileName); + data.put("newFileName", FileUtils.getName(fileName)); + data.put("originalFilename", file.getOriginalFilename()); + + ajax.put("msg","鎿嶄綔鎴愬姛"); + ajax.put("data",data); return ajax; } catch (Exception e) -- Gitblit v1.9.1