From b7f0865107438d5f57b1ec39ca28d81e52bc13fc Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 24 十月 2023 21:26:07 +0800
Subject: [PATCH] 127836
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 178 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 106 insertions(+), 72 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 b68b6f5..b581239 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,6 +1,7 @@
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;
@@ -10,6 +11,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -40,37 +42,64 @@
private static final String FILE_DELIMETER = ",";
- /**
- * 閫氱敤涓嬭浇璇锋眰
- *
- * @param fileName 鏂囦欢鍚嶇О
- * @param delete 鏄惁鍒犻櫎
- */
- @GetMapping("/download")
- public void fileDownload(@PathParam("fileName") String fileName, @PathParam("delete") Boolean delete, HttpServletResponse response, HttpServletRequest request)
- {
- try
- {
- if (!FileUtils.checkAllowDownload(fileName))
- {
- throw new Exception(StringUtils.format("鏂囦欢鍚嶇О({})闈炴硶锛屼笉鍏佽涓嬭浇銆� ", fileName));
- }
- String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
- String filePath = RuoYiConfig.getDownloadPath() + fileName;
+// @GetMapping("/downloadFile")
+// public void fileDownload(@PathParam("path") String path, HttpServletResponse response)
+// {
+// path=path.substring(8);
+// try
+// {
+// if (!FileUtils.checkAllowDownload(path))
+// {
+// throw new Exception(StringUtils.format("鏂囦欢鍚嶇О({})闈炴硶锛屼笉鍏佽涓嬭浇銆� ", path));
+// }
+// String realFileName = System.currentTimeMillis() + path.substring(path.indexOf("_") + 1);
+// String filePath = RuoYiConfig.getProfile() + path;
+//
+// response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+// FileUtils.setAttachmentResponseHeader(response, realFileName);
+// FileUtils.writeBytes(filePath, response.getOutputStream());
+//
+// }
+// catch (Exception e)
+// {
+// log.error("涓嬭浇鏂囦欢澶辫触", e);
+// }
+// }
- response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
- FileUtils.setAttachmentResponseHeader(response, realFileName);
- FileUtils.writeBytes(filePath, response.getOutputStream());
- if (delete)
- {
- FileUtils.deleteFile(filePath);
- }
- }
- catch (Exception e)
- {
- log.error("涓嬭浇鏂囦欢澶辫触", e);
- }
- }
+
+
+
+// /**
+// * 閫氱敤涓嬭浇璇锋眰
+// *
+// * @param fileName 鏂囦欢鍚嶇О
+// * @param delete 鏄惁鍒犻櫎
+// */
+// @GetMapping("/download")
+// public void fileDownload(@PathParam("fileName") String fileName, @PathParam("delete") Boolean delete, HttpServletResponse response)
+// {
+// try
+// {
+// if (!FileUtils.checkAllowDownload(fileName))
+// {
+// throw new Exception(StringUtils.format("鏂囦欢鍚嶇О({})闈炴硶锛屼笉鍏佽涓嬭浇銆� ", fileName));
+// }
+// String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+// String filePath = RuoYiConfig.getDownloadPath() + fileName;
+//
+// response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+// FileUtils.setAttachmentResponseHeader(response, realFileName);
+// FileUtils.writeBytes(filePath, response.getOutputStream());
+// if (delete)
+// {
+// FileUtils.deleteFile(filePath);
+// }
+// }
+// catch (Exception e)
+// {
+// log.error("涓嬭浇鏂囦欢澶辫触", e);
+// }
+// }
@GetMapping("/downLoadFile")
public void downLoadFile(@PathParam("path") String path, HttpServletResponse response) throws Exception {
@@ -82,21 +111,26 @@
* 閫氱敤涓婁紶璇锋眰锛堝崟涓級
*/
@PostMapping("/upload")
- public AjaxResult uploadFile(@RequestParam("uploadFile") MultipartFile file) throws Exception
+ public AjaxResult uploadFile(@RequestParam("uploadFile") MultipartFile file,String fname) throws Exception
{
try
{
// 涓婁紶鏂囦欢璺緞
String filePath = RuoYiConfig.getUploadPath();
// 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
- String fileName = FileUploadUtils.upload(filePath, file);
+ String fileName = FileUploadUtils.upload(filePath, file,fname);
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)
@@ -105,42 +139,42 @@
}
}
- /**
- * 閫氱敤涓婁紶璇锋眰锛堝涓級
- */
- @PostMapping("/uploads")
- public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
- {
- try
- {
- // 涓婁紶鏂囦欢璺緞
- String filePath = RuoYiConfig.getUploadPath();
- List<String> urls = new ArrayList<String>();
- List<String> fileNames = new ArrayList<String>();
- List<String> newFileNames = new ArrayList<String>();
- List<String> originalFilenames = new ArrayList<String>();
- for (MultipartFile file : files)
- {
- // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
- String fileName = FileUploadUtils.upload(filePath, file);
- String url = serverConfig.getUrl() + fileName;
- urls.add(url);
- fileNames.add(fileName);
- newFileNames.add(FileUtils.getName(fileName));
- originalFilenames.add(file.getOriginalFilename());
- }
- AjaxResult ajax = AjaxResult.success();
- ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
- ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
- ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
- ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
- return ajax;
- }
- catch (Exception e)
- {
- return AjaxResult.error(e.getMessage());
- }
- }
+// /**
+// * 閫氱敤涓婁紶璇锋眰锛堝涓級
+// */
+// @PostMapping("/uploads")
+// public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
+// {
+// try
+// {
+// // 涓婁紶鏂囦欢璺緞
+// String filePath = RuoYiConfig.getUploadPath();
+// List<String> urls = new ArrayList<String>();
+// List<String> fileNames = new ArrayList<String>();
+// List<String> newFileNames = new ArrayList<String>();
+// List<String> originalFilenames = new ArrayList<String>();
+// for (MultipartFile file : files)
+// {
+// // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
+// String fileName = FileUploadUtils.upload(filePath, file);
+// String url = serverConfig.getUrl() + fileName;
+// urls.add(url);
+// fileNames.add(fileName);
+// newFileNames.add(FileUtils.getName(fileName));
+// originalFilenames.add(file.getOriginalFilename());
+// }
+// AjaxResult ajax = AjaxResult.success();
+// ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
+// ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
+// ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
+// ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
+// return ajax;
+// }
+// catch (Exception e)
+// {
+// return AjaxResult.error(e.getMessage());
+// }
+// }
/**
* 鏈湴璧勬簮閫氱敤涓嬭浇
--
Gitblit v1.9.1