Merge remote-tracking branch 'origin/MVP1.5.5' into MVP1.5.5

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/controller/EkpOrderController.java

 package com.yifu.cloud.plus.v1.yifu.order.controller;
 
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.order.constants.OrderConstants;
 import com.yifu.cloud.plus.v1.yifu.order.service.TOrderService;
 import com.yifu.cloud.plus.v1.yifu.order.util.EkpOrderFileTask;
 import com.yifu.cloud.plus.v1.yifu.order.vo.OrderAddVO;
@@ -10,14 +13,17 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.annotation.Resource;
+import java.io.File;
 import java.io.IOException;
 
 /**
@@ -33,10 +39,8 @@ import java.io.IOException;
 public class EkpOrderController {
 	@Resource
 	private TOrderService tOrderService;
-
 	@Autowired
 	private EkpOrderFileTask ekpOrderFileTask;
-
 	/**
 	 * 接收处理ekp订单
 	 *
@@ -62,8 +66,27 @@ public class EkpOrderController {
 	 */
 	@Schema(description = "接收处理ekp附件")
 	@PostMapping(value = "/receiveOrderNew")
-	public R receiveOrder(OrderAttVo vo) {
-		ekpOrderFileTask.receiveOrderNew(vo);
+	public R receiveOrder(OrderAttVo vo) throws IOException {
+		if (Common.isEmpty(vo.getOrderNo())){
+			return R.failed(OrderConstants.ORDER_NO_IS_EMPTY);
+		}
+		if (ArrayUtils.isNotEmpty(vo.getFile())){
+			if (vo.getFile().length > CommonConstants.TWENTY_INT){
+				return R.failed(OrderConstants.ENCLOSURE_SIZE_ERROR);
+			}
+			String fileName;
+			for (MultipartFile multipartFile : vo.getFile()) {
+				if(!Common.checkInsuranceFile(multipartFile.getOriginalFilename())){
+					return R.failed(OrderConstants.ENCLOSURE_TYPE_IS_ERROR);
+				}
+				if (multipartFile.getSize() > (CommonConstants.FIFTY_INT*CommonConstants.BYTE*CommonConstants.BYTE)){
+					return R.failed(OrderConstants.ENCLOSURE_SIZE_ERROR);
+				}
+				fileName = System.currentTimeMillis() + "_" + multipartFile.getOriginalFilename();
+				ekpOrderFileTask.receiveOrderNew(multipartFile.getInputStream(),vo.getFile1(),vo.getOrderNo(),fileName
+						,multipartFile.getOriginalFilename());
+			}
+		}
 		return R.ok();
 	}
 

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/TOrderService.java

@@ -10,6 +10,7 @@ import com.yifu.cloud.plus.v1.yifu.order.vo.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 
 /**
@@ -99,27 +100,23 @@ public interface TOrderService extends IService<TOrder> {
 	 */
 	R receiveOrder(OrderAddVO vo) throws IOException;
 
-
-
 	/**
-	 * 接收处理ekp附件
+	 * 接收处理ekp订单回复
 	 *
 	 * @author licancan
 	 * @param vo
 	 * @return {@link R}
 	 * @throws IOException
 	 */
-	R receiveOrderNew(OrderAttVo vo ) throws IOException;
-
+	R receiveOrderReply(OrderReplyAddVO vo) throws IOException;
 	/**
-	 * 接收处理ekp订单回复
+	 * 接收处理ekp附件
 	 *
 	 * @author licancan
-	 * @param vo
 	 * @return {@link R}
 	 * @throws IOException
 	 */
-	R receiveOrderReply(OrderReplyAddVO vo) throws IOException;
+	void receiveOrderNew(InputStream inputStream, String file1, String orderNo, String fileName, String originalFileName) throws IOException;
 
 	/**
 	 * 订单作废

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/util/EkpOrderFileTask.java

@@ -8,6 +8,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * @Author fxj
@@ -28,12 +29,12 @@ public class EkpOrderFileTask {
 	 * @return
 	**/
 	@Async
-	public void receiveOrderNew(OrderAttVo vo){
+	public void receiveOrderNew(InputStream inputStream, String file1, String orderNo, String fileName, String originalFileName){
 		synchronized (this){
 			try {
-				orderService.receiveOrderNew(vo);
+				orderService.receiveOrderNew(inputStream,file1,orderNo,fileName,originalFileName);
 			} catch (IOException e) {
-				log.error("订单附件删除异常：",e);
+				log.error("订单附件上传异常：",e);
 			}
 		}
 	}