增加云燕车辆历史轨迹核验接口（装卸货核验）

pom.xml

@@ -213,6 +213,52 @@
 					</execution>
 				</executions>
 			</plugin>
+
+
+
+<!--			<plugin>-->
+<!--				<groupId>org.springframework.boot</groupId>-->
+<!--				<artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--			</plugin>-->
+
+<!--			<plugin>-->
+<!--				<groupId>org.apache.maven.plugins</groupId>-->
+<!--				<artifactId>maven-jar-plugin</artifactId>-->
+<!--			</plugin>-->
+<!--			<plugin>-->
+<!--				<groupId>org.apache.maven.plugins</groupId>-->
+<!--				<artifactId>maven-dependency-plugin</artifactId>-->
+<!--			</plugin>-->
+<!--			<plugin>-->
+<!--				<groupId>org.apache.maven.plugins</groupId>-->
+<!--				<artifactId>maven-resources-plugin</artifactId>-->
+<!--				<executions>-->
+<!--					<execution>-->
+<!--						<id>default-resources</id>-->
+<!--						<phase>validate</phase>-->
+<!--						<goals>-->
+<!--							<goal>copy-resources</goal>-->
+<!--						</goals>-->
+<!--						<configuration>-->
+<!--							<outputDirectory>target/classes</outputDirectory>-->
+<!--							<useDefaultDelimiters>false</useDefaultDelimiters>-->
+<!--							<delimiters>-->
+<!--								<delimiter>@</delimiter>-->
+<!--							</delimiters>-->
+<!--							<resources>-->
+<!--								<resource>-->
+<!--									<directory>src/main/resources</directory>-->
+<!--									<filtering>true</filtering>-->
+<!--									<includes>-->
+<!--										<include>**</include>-->
+<!--									</includes>-->
+<!--								</resource>-->
+
+<!--							</resources>-->
+<!--						</configuration>-->
+<!--					</execution>-->
+<!--				</executions>-->
+<!--			</plugin>-->
 		</plugins>
 	</build>
-</project>
+</project>

src/main/java/info/aspirecn/iov/yysj/product/check/common/ZuulHelper.java

@@ -9,6 +9,7 @@ import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson.JSONObject;
 import info.aspirecn.cloud.yysj.commons.lang.BillItemResult;
 import info.aspirecn.cloud.yysj.commons.lang.Constants;
 import info.aspirecn.cloud.yysj.commons.lang.OtherCommonResult;
@@ -43,7 +44,7 @@ public class ZuulHelper {
 	@Autowired
 	private ZuulHelper helper;
 	public Boolean hasProcessFlag(RequestContext requestContext) {
-        
+
         Boolean ret = (Boolean)requestContext.get("process");
         if( ret != null )
         {
@@ -54,7 +55,7 @@ public class ZuulHelper {
             return Boolean.FALSE;
         }
     }
-	
+
 	public void responseHandle(BillItemResult responseObject, RequestContext requestContext) throws JsonProcessingException{
 		String json = mapper.writeValueAsString(responseObject);
 		log.info("json:{}",json);
@@ -245,7 +246,27 @@ public class ZuulHelper {
 					errorResponse.setCode(Constants.ErrorCode.INCONSISTENT_DETAIL.getErrorCode());
 					errorResponse.setResultList(inconsistentList);
 				}
-			}else {
+			} else if(String.valueOf(productMap.get("zxhdwyz")).equals(String.valueOf(productId))){
+				if ("1".equals(responseObject.getResultCode())) {
+					// 核验一致
+					result =Constants.consistent_code;
+					billItemResult.setDetail(JSON.toJSONString(responseObject.getResultBody()));
+				} else if ("2".equals(responseObject.getResultCode())) {
+					// 核验不一致
+					result =Constants.inconsistent_code;
+					billItemResult.setDetail(String.valueOf(responseObject.getResultBody()));
+				} else if ("4".equals(responseObject.getResultCode())) {
+					// 数据源为空
+					emptyList.add(Constants.zxh_data);
+					errorResponse.setCode(Constants.ErrorCode.NULL.getErrorCode());
+					errorResponse.setResultList(emptyList);
+				} else {
+					// 查询失败
+					billItemResult.setResult(Constants.inconsistent_code);
+					errorResponse.setCode(Constants.ErrorCode.Exception.getErrorCode());
+					billItemResult.setExceptionInformation(errorResponse);
+				}
+			} else {
 				log.info("codes:{},productCode:{}",property.getDetailProductCodes(),productCode);
 				if (!"1".equals(responseObject.getResultCode())&&!"1000".equals(responseObject.getResultCode())) {
 					/*if("3".equals(responseObject.getResultCode())){
@@ -273,16 +294,16 @@ public class ZuulHelper {
 
 					}*/
 				}else if(("1".equals(responseObject.getResultCode())||"1000".equals(responseObject.getResultCode())) &&
-						StringUtils.isNotEmpty(productCode) && 
+						StringUtils.isNotEmpty(productCode) &&
 						property.getDetailProductCodes().contains(productCode)) {//&&productCode在匹配的列表
-					
+
 					Object body = responseObject.getResultBody() ;
 					if(body instanceof String) {
 						billItemResult.setDetail((String)body);
 					}else {
 						billItemResult.setDetail(JSON.toJSONString(body));
 					}
-					
+
 				}
 			}
 
@@ -293,6 +314,7 @@ public class ZuulHelper {
 		}
 		billItemResult.setResult(result);
 		billItemResult.setExceptionInformation(errorResponse);
+		log.info("zuulHelper.billItemResult:{}", billItemResult);
 	}
 	public void transferParam(Map<String,String> productMap,String productId,List<String> list){
 		List<String> removeList = new ArrayList<String>();
@@ -426,7 +448,7 @@ public class ZuulHelper {
 			errorResponse.setCode(Constants.ErrorCode.Exception.getErrorCode());
 			billItemResult.setExceptionInformation(errorResponse);
 		} else {
-			 helper.handleResult(sjjhTransferReq.getSjjhProductId(), responseObject, sjjhTransferReq.getOriginCustomBody(),billItemResult,productCode);
+			helper.handleResult(sjjhTransferReq.getSjjhProductId(), responseObject, sjjhTransferReq.getOriginCustomBody(),billItemResult,productCode);
 
 		}
 

src/main/java/info/aspirecn/iov/yysj/product/check/pre/WayBillFilter.java

@@ -79,7 +79,6 @@ public class WayBillFilter extends ZuulFilter {
 				sjjhTransferReq.setOriginCustomBody(customMap);
 				sjjhTransferReq.setToken(token);
 				ResponseObject responseObject = helper.getResult(sjjhTransferReq,billItemResult,productCheckRequest.getProductCode());
-
 				price = responseObject.getPrice();
 			}else{