本地文件上传修改
This commit is contained in:
@@ -4,6 +4,11 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.vetti.common.core.domain.R;
|
||||
import com.vetti.common.core.domain.dto.FileDto;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -25,6 +30,7 @@ import com.vetti.framework.config.ServerConfig;
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
@Api(tags ="通用请求处理")
|
||||
@RestController
|
||||
@RequestMapping("/common")
|
||||
public class CommonController
|
||||
@@ -42,6 +48,7 @@ public class CommonController
|
||||
* @param fileName 文件名称
|
||||
* @param delete 是否删除
|
||||
*/
|
||||
@ApiOperation("通用下载请求")
|
||||
@GetMapping("/download")
|
||||
public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
|
||||
{
|
||||
@@ -71,8 +78,9 @@ public class CommonController
|
||||
/**
|
||||
* 通用上传请求(单个)
|
||||
*/
|
||||
@ApiOperation("通用上传请求(单个)")
|
||||
@PostMapping("/upload")
|
||||
public AjaxResult uploadFile(MultipartFile file) throws Exception
|
||||
public R<FileDto> uploadFile(MultipartFile file) throws Exception
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -81,24 +89,25 @@ public class CommonController
|
||||
// 上传并返回新文件名称
|
||||
String fileName = FileUploadUtils.upload(filePath, file);
|
||||
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());
|
||||
return ajax;
|
||||
FileDto fileDto = new FileDto();
|
||||
fileDto.setUrl(url);
|
||||
fileDto.setFileName(fileName);
|
||||
fileDto.setNewFileName(FileUtils.getName(fileName));
|
||||
fileDto.setOriginalFilename(file.getOriginalFilename());
|
||||
return R.ok(fileDto);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return AjaxResult.error(e.getMessage());
|
||||
return R.fail(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 通用上传请求(多个)
|
||||
*/
|
||||
@ApiOperation("通用上传请求(多个)")
|
||||
@PostMapping("/uploads")
|
||||
public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
|
||||
public R<FileDto> uploadFiles(List<MultipartFile> files) throws Exception
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -118,16 +127,17 @@ public class CommonController
|
||||
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;
|
||||
FileDto fileDto = new FileDto();
|
||||
fileDto.setUrl(StringUtils.join(urls, FILE_DELIMETER));
|
||||
fileDto.setFileName(StringUtils.join(fileNames, FILE_DELIMETER));
|
||||
fileDto.setNewFileName(StringUtils.join(newFileNames, FILE_DELIMETER));
|
||||
fileDto.setOriginalFilename(StringUtils.join(originalFilenames, FILE_DELIMETER));
|
||||
|
||||
return R.ok(fileDto);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return AjaxResult.error(e.getMessage());
|
||||
return R.fail(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user