Zhaops 6 gadi atpakaļ
vecāks
revīzija
2ae3bb30c5

+ 3 - 1
icssman-service/src/main/java/com/diagbot/service/UploadService.java

@@ -2,11 +2,13 @@ package com.diagbot.service;
 
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Map;
+
 /**
  * @Description: 文件上传服务接口
  * @author: gaodm
  * @time: 2018/11/13 13:50
  */
 public interface UploadService {
-    String singleFileUpload(MultipartFile file);
+    Map<String,Object> singleFileUpload(MultipartFile file);
 }

+ 21 - 2
icssman-service/src/main/java/com/diagbot/service/impl/UploadServiceImpl.java

@@ -11,6 +11,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @Description: 文件上传服务接口实现
@@ -21,7 +23,7 @@ import java.io.InputStream;
 @Service
 public class UploadServiceImpl implements UploadService {
     @Override
-    public String singleFileUpload(MultipartFile file) {
+    public Map<String,Object> singleFileUpload(MultipartFile file) {
         String path = "";
         if (file.isEmpty()) {
             throw new CommonException(ServiceErrorCode.FILE_UPLOAD_ERROE, "文件不能为空");
@@ -37,7 +39,24 @@ public class UploadServiceImpl implements UploadService {
             log.error("文件上传失败", e);
             throw new CommonException(ServiceErrorCode.FILE_UPLOAD_ERROE, "文件上传失败,请重新上传");
         }
-        return path;
+        return resultMap("SUCCESS", path, file.getOriginalFilename(), file.getOriginalFilename());
+    }
+
+    /**
+     * 上传文件返回格式
+     * @param state
+     * @param url
+     * @param title
+     * @param original
+     * @return
+     */
+    private Map<String,Object> resultMap(String state, String url, String title, String original){
+        Map<String ,Object> result = new HashMap<>();
+        result.put("state",state);
+        result.put("original",original);
+        result.put("title",title);
+        result.put("url", url);
+        return result;
     }
 
     /**

+ 8 - 3
icssman-service/src/main/java/com/diagbot/web/UploadController.java

@@ -6,23 +6,28 @@ import io.swagger.annotations.Api;
 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.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @RestController
 @Api(value = "文件上传API", tags = { "文件上传API" })
-@RequestMapping("/file")
+@RequestMapping(value = "/file",method = RequestMethod.GET)
 @SuppressWarnings("unchecked")
 public class UploadController {
     @Autowired
     private UploadFacade uploadFacade;
 
-    @PostMapping("/upload")
-    public RespDTO<String> singleFileUpload(@RequestParam("file") MultipartFile file) {
+    @PostMapping("/uploadImage")
+    public RespDTO<Map<String, Object>> singleFileUpload(@RequestParam("upfile") MultipartFile file) {
         return RespDTO.onSuc(uploadFacade.singleFileUpload(file));
     }
 
+
     @PostMapping("/deleteRemoteFile")
     public RespDTO<Boolean> deleteRemoteFile(@RequestParam("path") String path) {
         return RespDTO.onSuc(uploadFacade.deleteRemoteFile(path));