Skip to content

8
8timerapiv200
Commit 631d9355 by Your Name Committed by chenzg
Options

更新了上传文件的出现的问题

parent 2ba4c22c
Showing with 15 additions and 11 deletions
src/main/java/cn/timer/api/controller/oss/OSSController.java
...@@ -3,6 +3,7 @@ package cn.timer.api.controller.oss; ...@@ -3,6 +3,7 @@ package cn.timer.api.controller.oss;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -34,16 +35,17 @@ public class OSSController { ...@@ -34,16 +35,17 @@ public class OSSController {
/** /**
* 上传普通文件 * 上传普通文件
* *
* @param userBean * @param userBean
* @param moudle * @param moudle
*/ */
@PostMapping(value = "/upload") @PostMapping(value = "/upload")
@ApiOperation(value = "上传普通文件", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "上传普通文件", httpMethod = "POST", notes = "接口发布说明")
public Result<String> upload(@CurrentUser UserBean userBean, @RequestParam(required = false) String moudle, public Result<String> upload(@CurrentUser UserBean userBean, @RequestParam(required = false) String moudle,
@Param("file") MultipartFile file) { @Param("file") MultipartFile file) {
String url = null; String url = null;
String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" + file.getOriginalFilename(); int uuid = (int) (Math.random()*100+1);
String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" +uuid+"-"+ file.getOriginalFilename();
if (file == null || file.getSize() <= 0) { if (file == null || file.getSize() <= 0) {
return ResultUtil.error("上传的文件为空，请重新选择！"); return ResultUtil.error("上传的文件为空，请重新选择！");
} else { } else {
...@@ -58,18 +60,19 @@ public class OSSController { ...@@ -58,18 +60,19 @@ public class OSSController {
/** /**
* 批量上传普通文件 * 批量上传普通文件
* *
* @param userBean * @param userBean
* @param moudle * @param moudle
*/ */
@PostMapping(value = "/uploads") @PostMapping(value = "/uploads")
@ApiOperation(value = "批量上传普通文件", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "批量上传普通文件", httpMethod = "POST", notes = "接口发布说明")
public Result<Object> uploads(@CurrentUser UserBean userBean, @RequestParam(required = false) String moudle, public Result<Object> uploads(@CurrentUser UserBean userBean, @RequestParam(required = false) String moudle,
@Param("files") List<MultipartFile> files) { @Param("files") List<MultipartFile> files) {
String url = null; String url = null;
List<String> list = new ArrayList<String>(); List<String> list = new ArrayList<String>();
for (MultipartFile file : files) { for (MultipartFile file : files) {
String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" + file.getOriginalFilename(); int uuid = (int) (Math.random()*100+1);
String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" +uuid+"-"+ file.getOriginalFilename();
if (file == null || file.getSize() <= 0) { if (file == null || file.getSize() <= 0) {
return ResultUtil.error("上传的文件为空，请重新选择！"); return ResultUtil.error("上传的文件为空，请重新选择！");
} else { } else {
...@@ -90,8 +93,9 @@ public class OSSController { ...@@ -90,8 +93,9 @@ public class OSSController {
@PostMapping(value = "/uploadpri") @PostMapping(value = "/uploadpri")
@ApiOperation(value = "上传私密文件", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "上传私密文件", httpMethod = "POST", notes = "接口发布说明")
public Result<String> uploadPrivate(@CurrentUser UserBean userBean, @RequestParam(required = false) String moudle, public Result<String> uploadPrivate(@CurrentUser UserBean userBean, @RequestParam(required = false) String moudle,
@Param("file") MultipartFile file) { @Param("file") MultipartFile file) {
String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" + file.getOriginalFilename(); int uuid = (int) (Math.random()*100+1);
String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" +uuid+"-"+ file.getOriginalFilename();
if (file == null || file.getSize() <= 0) { if (file == null || file.getSize() <= 0) {
return ResultUtil.error("上传的文件为空，请重新选择！"); return ResultUtil.error("上传的文件为空，请重新选择！");
} else { } else {
...@@ -125,7 +129,7 @@ public class OSSController { ...@@ -125,7 +129,7 @@ public class OSSController {
@PostMapping(value = "/getpri") @PostMapping(value = "/getpri")
@ApiOperation(value = "获取私密文件url", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "获取私密文件url", httpMethod = "POST", notes = "接口发布说明")
public Result<String> getUrlPrivate(@CurrentUser UserBean userBean, @RequestParam String moudle, public Result<String> getUrlPrivate(@CurrentUser UserBean userBean, @RequestParam String moudle,
@RequestParam String fileName) { @RequestParam String fileName) {
String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" + fileName; String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" + fileName;
String url = oss.getUrlP(path); String url = oss.getUrlP(path);
return ResultUtil.data(url, "获取成功"); return ResultUtil.data(url, "获取成功");
...@@ -133,7 +137,7 @@ public class OSSController { ...@@ -133,7 +137,7 @@ public class OSSController {
/*********** /***********
* DELETE * DELETE
* *
* @param moudle * @param moudle
* @param fileName * @param fileName
************/ ************/
...@@ -141,7 +145,7 @@ public class OSSController { ...@@ -141,7 +145,7 @@ public class OSSController {
@DeleteMapping(value = "/delSingle") @DeleteMapping(value = "/delSingle")
@ApiOperation(value = "删除单个(谨慎使用)", httpMethod = "DELETE", notes = "接口发布说明") @ApiOperation(value = "删除单个(谨慎使用)", httpMethod = "DELETE", notes = "接口发布说明")
public Result<String> delSingle(@CurrentUser UserBean userBean, @RequestParam(required = false) String moudle, public Result<String> delSingle(@CurrentUser UserBean userBean, @RequestParam(required = false) String moudle,
@RequestParam(required = false) String fileName) { @RequestParam(required = false) String fileName) {
try { try {
String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" + fileName; String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" + fileName;
oss.delSingleFile(path); oss.delSingleFile(path);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment