提交修改

api-mapper/src/main/java/com/heyu/api/data/dto/VvCategoryDTO.java

@@ -5,8 +5,6 @@ import lombok.Data;
 
 @Data
 public class VvCategoryDTO  extends VvCategoryEntity {
-
-
     /***
      * 是否有child
      */

api-third/src/main/java/com/heyu/api/oss/OssFileUploadService.java

@@ -5,6 +5,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 类OssFileUploadService.java的实现描述：
@@ -89,5 +91,7 @@ public interface OssFileUploadService {
      */
     public String uploadFileContentByBase64(String base64, String suffix);
 
+    public List<Map<String, Object>> uploadImages(MultipartFile[] files);
+
 
 }

api-third/src/main/java/com/heyu/api/oss/OssFileUploadServiceImpl.java

@@ -7,6 +7,7 @@ import com.heyu.api.data.constants.MimeTypeEnums;
 import com.heyu.api.data.utils.ConfigProperties;
 import com.heyu.api.data.utils.DigestUtil;
 import com.heyu.api.data.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -14,8 +15,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.*;
-import java.util.Base64;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * 类OssFileUploadServiceImpl.java的实现描述：oss上传文件类
@@ -23,6 +23,7 @@ import java.util.UUID;
  * @author richen 2015年12月1日 下午6:11:49
  */
 @Service
+@Slf4j
 public class OssFileUploadServiceImpl implements OssFileUploadService {
 
     private static Logger log = LoggerFactory.getLogger(OssFileUploadServiceImpl.class);
@@ -48,6 +49,31 @@ public class OssFileUploadServiceImpl implements OssFileUploadService {
         return this.uploadFileToOss(imageFile, contextType, path, fileNameSuffix);
     }
 
+
+
+    @Override
+    public List<Map<String, Object>> uploadImages(MultipartFile[] files) {
+        List<Map<String,Object>> result = new ArrayList<>();
+        for(MultipartFile file: files){
+            log.info("uploadImage filename = " + file.getOriginalFilename() + ",fileSize=" + file.getSize());
+
+            String url;
+            Map<String,Object> data = new HashMap<>(2);
+            OssUploadResult uploadResult = uploadImageToOss(file);
+            if(uploadResult.isSuccess()){
+                url =  uploadResult.getUrl();
+                data.put("srcFileName", file.getOriginalFilename());
+                data.put("url", url);
+            }else{
+                data.put("srcFileName", file.getOriginalFilename());
+                data.put("url", "");
+            }
+            result.add(data);
+        }
+        return result;
+    }
+
+
     @Override
     public OssUploadResult uploadImageToOss(MultipartFile imageFile) {
         String fileName = imageFile.getOriginalFilename();

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/CategoryController.java

@@ -53,7 +53,6 @@ public class CategoryController {
         return R.ok().setData("保存成功");
     }
 
-
     /***
      * 排序
      */
@@ -78,7 +77,4 @@ public class CategoryController {
         return false;
     }
 
-
-
-
 }

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/UploadOssController.java

@@ -0,0 +1,37 @@
+package com.heyu.api.controller.mm;
+
+
+import com.heyu.api.data.utils.R;
+import com.heyu.api.oss.OssFileUploadService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@RestController
+@RequestMapping("/mm/upload")
+public class UploadOssController {
+
+    @Autowired
+    private OssFileUploadService ossFileUploadService;
+
+    /**
+     * @param files
+     * @return
+     */
+    @PostMapping("/file")
+    public R uploadFile(MultipartFile[] files) {
+        List<Map<String, Object>> data = ossFileUploadService.uploadImages(files);
+        return R.ok().setData(data);
+    }
+
+
+
+
+}