新增话题上传图片接口

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/UploadFileToServerUtils.java

@@ -0,0 +1,17 @@
+package com.elink.esua.epdc.commons.tools.utils;
+
+import java.io.File;
+
+/**
+ *
+ * 图片上传工具类
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/22 16:28
+ */
+public class UploadFileToServerUtils {
+
+    public static String uploadFile(File file) {
+        return "";
+    }
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java

@@ -14,6 +14,7 @@ import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
 import com.elink.esua.epdc.service.TopicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -133,4 +134,18 @@ public class ApiTopicController {
         ValidatorUtils.validateEntity(formDto);
         return topicService.changeToIssue(userDetail, formDto);
     }
+
+    /**
+     *
+     * 文件上传
+     *
+     * @params [file]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/11/25 10:45
+     */
+    @PostMapping("upload")
+    public Result<String> uploadImage(@RequestParam("file") MultipartFile file) {
+        return topicService.uploadImage(file);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/OssFeignClient.java

@@ -2,10 +2,13 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.UploadDTO;
 import com.elink.esua.epdc.dto.UploadFormDTO;
 import com.elink.esua.epdc.feign.fallback.OssFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 文件对象模块
@@ -24,4 +27,16 @@ public interface OssFeignClient {
      */
     @PostMapping(value = "oss/file/uploadBase64")
     Result<String> upload(UploadFormDTO formDTO);
+
+    /**
+     *
+     * 图片上传
+     *
+     * @params [file]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UploadDTO>
+     * @author liuchuang
+     * @since 2019/11/25 10:55
+     */
+    @PostMapping(value = "oss/file/upload")
+    Result<UploadDTO> upload(MultipartFile file);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/OssFeignClientFallback.java

@@ -3,9 +3,11 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.UploadDTO;
 import com.elink.esua.epdc.dto.UploadFormDTO;
 import com.elink.esua.epdc.feign.OssFeignClient;
 import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 文件对象模块
@@ -19,4 +21,9 @@ public class OssFeignClientFallback implements OssFeignClient {
     public Result<String> upload(UploadFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "upload", formDTO);
     }
+
+    @Override
+    public Result<UploadDTO> upload(MultipartFile file) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "upload", file);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/TopicService.java

@@ -9,6 +9,7 @@ import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -97,4 +98,15 @@ public interface TopicService {
      * @since 2019/11/8 10:37
      */
     Result changeToIssue(TokenDto userDetail, TopicChangeToIssueFormDTO formDto);
+
+    /**
+     *
+     * 文件上传
+     *
+     * @params [file]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/11/25 10:45
+     */
+    Result<String> uploadImage(MultipartFile file);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.service.impl;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
+import com.elink.esua.epdc.dto.UploadDTO;
 import com.elink.esua.epdc.dto.enums.TopicStateEnum;
 import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicChangeToIssueFormDTO;
@@ -12,11 +13,12 @@ import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
+import com.elink.esua.epdc.feign.OssFeignClient;
 import com.elink.esua.epdc.feign.TopicFeignClient;
 import com.elink.esua.epdc.service.TopicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
+import org.springframework.web.multipart.MultipartFile;
 import java.util.List;
 
 /**
@@ -35,6 +37,9 @@ public class TopicServiceImpl implements TopicService {
     @Autowired
     private TopicFeignClient topicFeignClient;
 
+    @Autowired
+    private OssFeignClient ossFeignClient;
+
     @Override
     public Result saveTopic(TokenDto userDetail, TopicSubmitFormDTO formDto) {
         if (null == userDetail) {
@@ -108,4 +113,14 @@ public class TopicServiceImpl implements TopicService {
         formDto.setUserId(userDetail.getUserId());
         return topicFeignClient.changeToIssue(formDto);
     }
+
+    @Override
+    public Result<String> uploadImage(MultipartFile file) {
+        Result<UploadDTO> result = ossFeignClient.upload(file);
+        if (!result.success()) {
+            return new Result<String>().error(result.getMsg());
+        }
+
+        return new Result<String>().ok(result.getData().getUrl());
+    }
 }