diff --git a/src/main/java/org/ils/file/controller/FileDetailController.java b/src/main/java/org/ils/file/controller/FileDetailController.java index fc39181..635dea1 100644 --- a/src/main/java/org/ils/file/controller/FileDetailController.java +++ b/src/main/java/org/ils/file/controller/FileDetailController.java @@ -13,7 +13,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.InputStream; /** @@ -36,8 +35,8 @@ public class FileDetailController { */ @ApiOperation("上传文件-返回fileInfo") @RequestMapping(value = "upload", method = RequestMethod.POST) - public Result upload(MultipartFile file) throws InterruptedException { - return Result.ok(ilsFileDetailService.upload(file)); + public Result upload(MultipartFile file, String userId, String conCode) throws InterruptedException { + return Result.ok(ilsFileDetailService.upload(file, userId, conCode)); } @@ -49,8 +48,8 @@ public class FileDetailController { */ @ApiOperation("上传文件-返回url") @RequestMapping(value = "uploadUrl", method = RequestMethod.POST) - public Result uploadUrl(MultipartFile file) { - return Result.ok(ilsFileDetailService.uploadUrl(file)); + public Result uploadUrl(MultipartFile file, String userId, String conCode) { + return Result.ok(ilsFileDetailService.uploadUrl(file, userId, conCode)); } /** @@ -60,8 +59,8 @@ public class FileDetailController { */ @ApiOperation("上传图片-缩略图") @RequestMapping(value = "uploadImage", method = RequestMethod.POST) - public Result uploadImage(MultipartFile file) { - return Result.ok(ilsFileDetailService.uploadImage(file)); + public Result uploadImage(MultipartFile file, String userId, String conCode) { + return Result.ok(ilsFileDetailService.uploadImage(file, userId, conCode)); } /** @@ -69,8 +68,8 @@ public class FileDetailController { */ @ApiOperation("上传文件到指定阿里云存储平台，成功返回文件信息") @RequestMapping(value = "uploadPlatform", method = RequestMethod.POST) - public Result uploadPlatform(MultipartFile file, String platform) { - return Result.ok(ilsFileDetailService.uploadPlatform(file, platform)); + public Result uploadPlatform(MultipartFile file, String platform, String userId, String conCode) { + return Result.ok(ilsFileDetailService.uploadPlatform(file, platform, userId, conCode)); } /** @@ -87,8 +86,8 @@ public class FileDetailController { */ @ApiOperation("根据url和文件后缀上传文件") @RequestMapping(value = "uploadByUrl", method = RequestMethod.POST) - public Result uploadByUrl(String url, String contentType, HttpServletResponse response) throws IOException { - return Result.ok(ilsFileDetailService.uploadByUrl(url, contentType, response)); + public Result uploadByUrl(String url, String contentType, String userId, String conCode, HttpServletResponse response) throws IOException { + return Result.ok(ilsFileDetailService.uploadByUrl(url, contentType, userId, conCode, response)); } /** @@ -96,8 +95,8 @@ public class FileDetailController { */ @ApiOperation("根据base64内容和文件后缀上传文件") @RequestMapping(value = "uploadByBase64", method = RequestMethod.POST) - public Result uploadByBase64(String base64, String contentType, HttpServletResponse response) throws IOException { - return Result.ok(ilsFileDetailService.uploadByBase64(base64, contentType, response)); + public Result uploadByBase64(String base64, String contentType, String userId, String conCode, HttpServletResponse response) throws IOException { + return Result.ok(ilsFileDetailService.uploadByBase64(base64, contentType, userId, conCode, response)); } } diff --git a/src/main/java/org/ils/file/service/IlsFileDetailService.java b/src/main/java/org/ils/file/service/IlsFileDetailService.java index ad4019c..144ed93 100644 --- a/src/main/java/org/ils/file/service/IlsFileDetailService.java +++ b/src/main/java/org/ils/file/service/IlsFileDetailService.java @@ -16,24 +16,24 @@ public interface IlsFileDetailService { /** * 上传文件 */ - public FileInfo upload(MultipartFile file); + public FileInfo upload(MultipartFile file, String userId, String conCode); /** * 上传文件，成功返回文件 url */ - public String uploadUrl(MultipartFile file); + public String uploadUrl(MultipartFile file,String userId, String conCode); /** * 上传图片，成功返回文件信息 */ - public FileInfo uploadImage(MultipartFile file); + public FileInfo uploadImage(MultipartFile file,String userId, String conCode); /** * 上传文件到指定阿里云存储平台，成功返回文件信息 */ - public FileInfo uploadPlatform(MultipartFile file, String platform); + public FileInfo uploadPlatform(MultipartFile file, String platform,String userId, String conCode); /** * 根据url下载文件流 @@ -47,7 +47,7 @@ public interface IlsFileDetailService { * @param url * @param contentType */ - public FileInfo uploadByUrl(String url, String contentType, HttpServletResponse response) throws FileNotFoundException; + public FileInfo uploadByUrl(String url, String contentType,String userId, String conCode, HttpServletResponse response) throws FileNotFoundException; /** @@ -55,6 +55,6 @@ public interface IlsFileDetailService { * @param base64 * @param contentType */ - public FileInfo uploadByBase64(String base64, String contentType, HttpServletResponse response) throws FileNotFoundException; + public FileInfo uploadByBase64(String base64, String contentType, String userId, String conCode, HttpServletResponse response) throws FileNotFoundException; } diff --git a/src/main/java/org/ils/file/service/impl/IlsFileDetailServiceImpl.java b/src/main/java/org/ils/file/service/impl/IlsFileDetailServiceImpl.java index 36be0fd..8cda89c 100644 --- a/src/main/java/org/ils/file/service/impl/IlsFileDetailServiceImpl.java +++ b/src/main/java/org/ils/file/service/impl/IlsFileDetailServiceImpl.java @@ -30,9 +30,10 @@ public class IlsFileDetailServiceImpl implements IlsFileDetailService { @Autowired private FileDetailService fileDetailService; @Override - public FileInfo upload(MultipartFile file) { + public FileInfo upload(MultipartFile file,String userId, String conCode) { FileInfo fileInfo = fileStorageService.of(file) - .setObjectId(file.getOriginalFilename()) + .setObjectId(conCode.length()==0? file.getOriginalFilename():conCode ) + .putAttr("userId", userId) .setOriginalFilename(file.getOriginalFilename()) .upload(); return fileInfo; @@ -40,12 +41,12 @@ public class IlsFileDetailServiceImpl implements IlsFileDetailService { @Override - public String uploadUrl(MultipartFile file) { + public String uploadUrl(MultipartFile file, String userId, String conCode) { FileInfo fileInfo = fileStorageService.of(file) .setPath("upload/") //保存到相对路径下，为了方便管理，不需要可以不写 - .setObjectId(file.getOriginalFilename()) //关联对象id，为了方便管理，不需要可以不写 + .setObjectId(conCode.length()==0? file.getOriginalFilename():conCode ) + .putAttr("userId", userId) .setObjectType("0") //关联对象类型，为了方便管理，不需要可以不写 - .putAttr("role","admin") //保存一些属性，可以在切面、保存上传记录、自定义存储平台等地方获取使用，不需要可以不写 .setOriginalFilename(file.getOriginalFilename()) .upload(); //将文件上传到对应地方 return fileInfo == null ? "上传失败！" : fileInfo.getUrl(); @@ -54,8 +55,11 @@ public class IlsFileDetailServiceImpl implements IlsFileDetailService { @Override - public FileInfo uploadImage(MultipartFile file) { + public FileInfo uploadImage(MultipartFile file,String userId, String conCode) { FileInfo fileInfo = fileStorageService.of(file) + .setObjectId(conCode.length()==0? file.getOriginalFilename():conCode ) + .putAttr("userId", userId) + .setOriginalFilename(file.getOriginalFilename()) .image(img -> img.size(1000,1000)) //将图片大小调整到 1000*1000 .thumbnail(th -> th.size(600,600)) //再生成一张 600*600 的缩略图 .upload(); @@ -65,8 +69,11 @@ public class IlsFileDetailServiceImpl implements IlsFileDetailService { @Override - public FileInfo uploadPlatform(MultipartFile file, String platform) { + public FileInfo uploadPlatform(MultipartFile file, String platform, String userId, String conCode) { FileInfo fileInfo = fileStorageService.of(file) + .setObjectId(conCode.length()==0? file.getOriginalFilename():conCode ) + .putAttr("userId", userId) + .setOriginalFilename(file.getOriginalFilename()) .setPlatform(platform) //使用指定的存储平台 .upload(); return fileInfo; @@ -89,14 +96,21 @@ public class IlsFileDetailServiceImpl implements IlsFileDetailService { } @Override - public FileInfo uploadByUrl(String url, String contentType, HttpServletResponse response) throws FileNotFoundException { - FileInfo fileInfo = fileStorageService.of(url).setOriginalFilename(System.currentTimeMillis() + SPLIT_STR + contentType).upload(); + public FileInfo uploadByUrl(String url, String contentType, String userId, String conCode, HttpServletResponse response) throws FileNotFoundException { + FileInfo fileInfo = fileStorageService.of(url) + .setObjectId(conCode) + .putAttr("userId", userId) + .setOriginalFilename(System.currentTimeMillis() + SPLIT_STR + contentType).upload(); return fileInfo; } @Override - public FileInfo uploadByBase64(String base64, String contentType, HttpServletResponse response) throws FileNotFoundException { - FileInfo fileInfo = fileStorageService.of(Base64.getDecoder().decode(base64)).setOriginalFilename(System.currentTimeMillis() + SPLIT_STR + contentType).upload(); + public FileInfo uploadByBase64(String base64, String contentType, String userId, String conCode, HttpServletResponse response) throws FileNotFoundException { + FileInfo fileInfo = fileStorageService.of(Base64.getDecoder().decode(base64)) + .setObjectId(conCode) + .putAttr("userId", userId) + .setOriginalFilename(System.currentTimeMillis() + SPLIT_STR + contentType) + .upload(); return fileInfo; }