Merge branch 'dev_thirdplatform' into dev_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java

@@ -489,7 +489,7 @@ public class HttpClientManager {
 				if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
 					InputStream is = response.getEntity().getContent();
 					FileItemFactory factory = new DiskFileItemFactory(16, null);
-					String textFieldName = "uploadfile";
+					String textFieldName = "file";
 					item = factory.createItem(textFieldName, ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName);
 					OutputStream os = item.getOutputStream();
 

epmet-module/epmet-third/epmet-third-client/pom.xml

@@ -19,6 +19,12 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>feign-form-spring</artifactId>
+                    <groupId>io.github.openfeign.form</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.github.binarywang</groupId>
@@ -32,6 +38,21 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>io.github.openfeign.form</groupId>
+            <artifactId>feign-form</artifactId>
+            <version>3.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign.form</groupId>
+            <artifactId>feign-form-spring</artifactId>
+            <version>3.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.3.3</version>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java

@@ -6,8 +6,13 @@ import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.EpmetThirdOpenFeignClientFallback;
+import com.epmet.feign.fallback.GovProjectOpenFeignClientFallback;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
+import feign.codec.Encoder;
+import feign.form.spring.SpringFormEncoder;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -19,8 +24,10 @@ import java.util.List;
  * @author zhaoqifeng
  * @date 2021/3/18 14:18
  */
-// @FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = GovProjectOpenFeignClientFallback.class,url = "localhost:8110")
+// @FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = EpmetThirdOpenFeignClientFallback.class,configuration =
-@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = EpmetThirdOpenFeignClientFallback.class)
+//		 EpmetThirdOpenFeignClient.MultipartSupportConfig.class,url = "localhost:8110")
+@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = EpmetThirdOpenFeignClientFallback.class, configuration =
+		EpmetThirdOpenFeignClient.MultipartSupportConfig.class)
 public interface EpmetThirdOpenFeignClient {
 	/**
 	 * 请求项目协助
@@ -36,12 +43,22 @@ public interface EpmetThirdOpenFeignClient {
 	/**
 	 * 上传文件
 	 * @author zhaoqifeng
-	 * @date 2021/3/25 16:10
+	 * @date 2021/3/25 18:36
 	 * @param file
-	 * @param formDTO
+	 * @param customerId
+	 * @param platformId
 	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UploadFileResultDTO>
 	 */
-	@PostMapping("third/project/uploadfile")
+	@PostMapping(value= "third/project/uploadfile", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-	Result<UploadFileResultDTO> uploadFile(@RequestParam("file") MultipartFile file, UploadFileFormDTO formDTO);
+	Result<UploadFileResultDTO> uploadFile(@RequestPart("file") MultipartFile file, @RequestParam("customerId") String customerId, @RequestParam(
+			"platformId") String platformId);
+
+	class MultipartSupportConfig {
+		@Bean
+		public Encoder feignFormEncoder() {
+			return new SpringFormEncoder();
+		}
+	}
+
 
 }

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java

@@ -38,13 +38,15 @@ public class EpmetThirdOpenFeignClientFallback implements EpmetThirdOpenFeignCli
 	 * 上传文件
 	 *
 	 * @param file
-	 * @param formDTO
+	 * @param customerId
+	 * @param platformId
 	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UploadFileResultDTO>
 	 * @author zhaoqifeng
-	 * @date 2021/3/25 16:10
+	 * @date 2021/3/25 18:36
 	 */
 	@Override
-	public Result<UploadFileResultDTO> uploadFile(MultipartFile file, UploadFileFormDTO formDTO) {
+	public Result<UploadFileResultDTO> uploadFile(MultipartFile file, String customerId, String platformId) {
-		return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "uploadFile", formDTO);
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "uploadFile", customerId);
 	}
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java

@@ -9,6 +9,7 @@ import com.epmet.dto.form.TPFDemoFormDTO;
 import com.epmet.dto.result.UploadFileResultDTO;
 import com.epmet.service.ProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -55,13 +56,17 @@ public class ProjectController {
      * @author zhaoqifeng
      * @date 2021/3/25 11:13
      * @param file
-     * @param formDTO
+     * @param customerId
+     * @param platformId
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UploadFileResultDTO>
      */
-    @PostMapping("uploadfile")
+    @PostMapping(value= "uploadfile" , consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public Result<UploadFileResultDTO> uploadFile(@RequestParam("file") MultipartFile file, UploadFileFormDTO formDTO) {
+    public Result<UploadFileResultDTO> uploadFile(@RequestPart("file") MultipartFile file, @RequestParam("customerId") String customerId, @RequestParam("platformId") String platformId) {
-        ValidatorUtils.validateEntity(formDTO);
+        UploadFileFormDTO formDTO = new UploadFileFormDTO();
         formDTO.setFile(file);
+        formDTO.setPlatformId(platformId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO);
         UploadFileResultDTO result = projectService.uploadFile(formDTO);
         return new Result<UploadFileResultDTO>().ok(result);
     }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -2141,7 +2141,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 					if (!multipartFileResult.success()) {
 						throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 					}
-					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+					uploadFileFormDTO.setFile(multipartFileResult.getData());
+					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),projectStaff.getCustomerId(), formDTO.getPlatformId());
 					if (!uploadResult.success()) {
 						throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 					}
@@ -2162,7 +2163,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 					if (!multipartFileResult.success()) {
 						throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 					}
-					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),projectStaff.getCustomerId(), formDTO.getPlatformId());
 					if (!uploadResult.success()) {
 						throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 					}
@@ -2183,7 +2184,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 					if (!multipartFileResult.success()) {
 						throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 					}
-					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),projectStaff.getCustomerId(), formDTO.getPlatformId());
 					if (!uploadResult.success()) {
 						throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 					}
@@ -2202,7 +2203,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 					if (!multipartFileResult.success()) {
 						throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 					}
-					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),projectStaff.getCustomerId(), formDTO.getPlatformId());
 					if (!uploadResult.success()) {
 						throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 					}
@@ -2257,7 +2258,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
-				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),
+						projectStaff.getCustomerId(), formDTO.getPlatformId());
 				if (!uploadResult.success()) {
 					throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 				}
@@ -2276,7 +2278,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
-				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),projectStaff.getCustomerId(), formDTO.getPlatformId());
 				if (!uploadResult.success()) {
 					throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 				}
@@ -2295,7 +2297,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
-				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),projectStaff.getCustomerId(), formDTO.getPlatformId());
 				if (!uploadResult.success()) {
 					throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 				}
@@ -2314,7 +2316,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
-				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),projectStaff.getCustomerId(), formDTO.getPlatformId());
 				if (!uploadResult.success()) {
 					throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 				}
@@ -2490,6 +2492,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			detail = detail + process;
 		}
 		System.out.println(detail);
+		log.debug(detail);
 		return detail;
 
 	}