From 1046a86a03d17df3f7203d161d6418a82187c093 Mon Sep 17 00:00:00 2001
From: BrandWang <rj090123@163.com>
Date: Wed, 10 May 2023 09:54:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=8F=AF=E5=9B=9E=E6=BA=AF):=20=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

解决feign接收参数问题
---
 .../recall/api/feign/TraceFeignClient.java    |  2 +-
 .../recall/feign/TraceFeignClientImpl.java    | 28 ++++++++++---------
 .../impl/RecallOrderApiServiceImpl.java       |  2 +-
 pom.xml                                       |  4 ---
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/afis-recall-api/src/main/java/com/wabestway/recall/api/feign/TraceFeignClient.java b/afis-recall-api/src/main/java/com/wabestway/recall/api/feign/TraceFeignClient.java
index fcc0a0b..15ca021 100644
--- a/afis-recall-api/src/main/java/com/wabestway/recall/api/feign/TraceFeignClient.java
+++ b/afis-recall-api/src/main/java/com/wabestway/recall/api/feign/TraceFeignClient.java
@@ -3,9 +3,9 @@ package com.wabestway.recall.api.feign;
 import com.wabestway.commons.http.ResObj;
 import com.wabestway.recall.api.dto.TraceUpDTO;
 import com.wabestway.recall.api.fallback.TraceFeignClientFallback;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(value = "afis-recall", fallback = TraceFeignClientFallback.class)
 public interface TraceFeignClient {
diff --git a/afis-recall-web/src/main/java/com/wabestway/recall/feign/TraceFeignClientImpl.java b/afis-recall-web/src/main/java/com/wabestway/recall/feign/TraceFeignClientImpl.java
index fbdda8a..b323b3b 100644
--- a/afis-recall-web/src/main/java/com/wabestway/recall/feign/TraceFeignClientImpl.java
+++ b/afis-recall-web/src/main/java/com/wabestway/recall/feign/TraceFeignClientImpl.java
@@ -19,19 +19,21 @@ public class TraceFeignClientImpl implements TraceFeignClient {
     @Override
     public ResObj batchTraceUp(TraceUpDTO traceUpDTO) {
         log.info("同步请求数据：{}", JSON.toJSONString(traceUpDTO));
-        traceUpDTO.getRecords().forEach(order -> {
-            RecallOrderEntity recallOrderEntity = recallOrderService.queryRecallOrderByOrderId(order.getOrderId());
-            if (recallOrderEntity != null) {
-                recallOrderEntity.setPolicyNo(order.getPolicyNo());
-                recallOrderEntity.setHolderName(order.getHolderName());
-                recallOrderEntity.setHolderPhone(order.getHolderPhone());
-                recallOrderEntity.setStartDate(order.getStartDate());
-                recallOrderEntity.setEndDate(order.getEndDate());
-                recallOrderEntity.setSupplierName(order.getSupplierName());
-                recallOrderEntity.setUpdateTime(System.currentTimeMillis());
-                recallOrderService.updateRecallOrderById(recallOrderEntity);
-            }
-        });
+        if (traceUpDTO != null && traceUpDTO.getRecords() != null) {
+            traceUpDTO.getRecords().forEach(order -> {
+                RecallOrderEntity recallOrderEntity = recallOrderService.queryRecallOrderByOrderId(order.getOrderId());
+                if (recallOrderEntity != null) {
+                    recallOrderEntity.setPolicyNo(order.getPolicyNo());
+                    recallOrderEntity.setHolderName(order.getHolderName());
+                    recallOrderEntity.setHolderPhone(order.getHolderPhone());
+                    recallOrderEntity.setStartDate(order.getStartDate());
+                    recallOrderEntity.setEndDate(order.getEndDate());
+                    recallOrderEntity.setSupplierName(order.getSupplierName());
+                    recallOrderEntity.setUpdateTime(System.currentTimeMillis());
+                    recallOrderService.updateRecallOrderById(recallOrderEntity);
+                }
+            });
+        }
         return ResObj.ok();
     }
 }
diff --git a/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderApiServiceImpl.java b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderApiServiceImpl.java
index 692529b..6c23175 100644
--- a/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderApiServiceImpl.java
+++ b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderApiServiceImpl.java
@@ -148,7 +148,7 @@ public class RecallOrderApiServiceImpl implements RecallOrderApiService {
                 e.printStackTrace();
             }
 
-            String[] video = {"rrvideo", "--input", "unpack.json", "--config", "/opt/review/config.json", "--output", "video.mp4"};
+            String[] video = {"rrvideo", "--input  unpack.json  --config /opt/review/config.json --output  video.mp4"};
             ProcessBuilder videoBuilder = new ProcessBuilder(video);
             videoBuilder.directory(tempDir.toFile());
             Process p2 = videoBuilder.start();
diff --git a/pom.xml b/pom.xml
index b4c8dd5..09b25a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,10 +11,7 @@
     <modules>
         <module>afis-recall-web</module>
         <module>afis-recall-service</module>
-        <module>afis-recall-api</module>
     </modules>
-
-
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
@@ -28,7 +25,6 @@
     </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>