订单对接ekp调整

yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/config/EkpOrderProperties.java

@@ -50,5 +50,13 @@ public class EkpOrderProperties {
 
 	String LoginName;
 
-	String docSubject;
+	/**
+	 * 描述：用于项目订单更新接口
+	 */
+	String orderDocSubject;
+
+	/**
+	 * 描述：用于订单回复接口
+	 */
+	String replyDocSubject;
 }

yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpOrderUtil.java

@@ -34,7 +34,7 @@ import java.util.List;
 @EnableConfigurationProperties(EkpOrderProperties.class)
 public class EkpOrderUtil {
 	@Autowired
-	private static EkpOrderProperties ekpProperties;
+	private EkpOrderProperties ekpProperties;
 
 	/**
 	 * 更新订单状态
@@ -51,7 +51,7 @@ public class EkpOrderUtil {
 			//指向EKP的接口url
 			//把ModelingAppModelParameterAddForm转换成MultiValueMap
 			MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>();
-			wholeForm.add("docSubject",ekpProperties.getDocSubject());
+			wholeForm.add("docSubject",ekpProperties.getOrderDocSubject());
 			wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}");
 			wholeForm.add("docStatus", ekpProperties.getDocStatus());
 			wholeForm.add("fdModelId", ekpProperties.getOrderFdModelId());
@@ -71,7 +71,7 @@ public class EkpOrderUtil {
 				log.error(EkpConstants.SEND_FAILED);
 				return null;
 			}else{
-				log.info(EkpConstants.SEND_SUCCESS+body);
+				log.info(EkpConstants.SEND_SUCCESS + body);
 				return body;
 			}
 		}catch (Exception e){
@@ -95,7 +95,7 @@ public class EkpOrderUtil {
 			//指向EKP的接口url
 			//把ModelingAppModelParameterAddForm转换成MultiValueMap
 			MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>();
-			wholeForm.add("docSubject",ekpProperties.getDocSubject());
+			wholeForm.add("docSubject",ekpProperties.getReplyDocSubject());
 			wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}");
 			wholeForm.add("docStatus", ekpProperties.getDocStatus());
 			wholeForm.add("fdModelId", ekpProperties.getReplyFdModelId());
@@ -135,7 +135,7 @@ public class EkpOrderUtil {
 	 * @param multipartFiles
 	 * @return {@link List<AttachmentForm>}
 	 */
-	public static List<AttachmentForm> createAllAttach(MultipartFile[] multipartFiles) throws Exception {
+	public List<AttachmentForm> createAllAttach(MultipartFile[] multipartFiles) throws Exception {
 		List<AttachmentForm> attForms = new ArrayList<>();
 		if (ArrayUtils.isNotEmpty(multipartFiles)){
 			for (MultipartFile multipartFile : multipartFiles) {
@@ -143,7 +143,7 @@ public class EkpOrderUtil {
 				//设置附件关键字，表单模式下为附件控件的id
 				attForm.setFdKey(ekpProperties.getReplyAttachKey());
 				attForm.setFdFileName(multipartFile.getOriginalFilename());
-				File file = null;
+				File file = new File(multipartFile.getOriginalFilename());
 				FileUtils.copyInputStreamToFile(multipartFile.getInputStream(), file);
 				DataSource dataSource = new FileDataSource(file);
 				DataHandler dataHandler = new DataHandler(dataSource);

yifu-common/yifu-common-ekp/src/main/resources/ekpOrderConfig.properties

@@ -6,6 +6,7 @@ ekporder.replyFdFlowId=182f1c3d6f5724e335b88d544be8c993
 ekporder.replyAttachKey=fd_3ac904c9342fe2
 ekporder.docStatus=20
 ekporder.LoginName=admin
-ekporder.docSubject=\u85AA\u8D44\u8BA2\u5355\u660E\u7EC6\u6570\u636E\u63A5\u53E3
+ekporder.orderDocSubject=\u7528\u4e8e\u9879\u76ee\u8ba2\u5355\u66f4\u65b0\u63a5\u53e3
+ekporder.replyDocSubject=\u7528\u4e8e\u8ba2\u5355\u56de\u590d\u63a5\u53e3