|
@@ -214,17 +214,17 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
|
|
|
|
|
|
|
|
log.info("===永诚--车型查询接口请求 =====参数确认:--" + ycConfigureParameters.getDptCde() + "===");
|
|
log.info("===永诚--车型查询接口请求 =====参数确认:--" + ycConfigureParameters.getDptCde() + "===");
|
|
|
ModelsQueryXml m = buildModelsQueryParam(carModelReq, ycConfigureParameters);
|
|
ModelsQueryXml m = buildModelsQueryParam(carModelReq, ycConfigureParameters);
|
|
|
- ObjectMapper xmlMapper = this.gainXmlMapper();
|
|
|
|
|
|
|
|
|
|
log.info("===永诚--车型查询接口请求开始--" + carInfo.getLicenseNo() + "===");
|
|
log.info("===永诚--车型查询接口请求开始--" + carInfo.getLicenseNo() + "===");
|
|
|
// InsApiLog apiLog = httpPost(xmlMapper, m, YcBuildData.API_MODEL);
|
|
// InsApiLog apiLog = httpPost(xmlMapper, m, YcBuildData.API_MODEL);
|
|
|
- String responseData = httpPostResultLog(xmlMapper, m, YcBuildData.API_MODEL, "永诚API方式 - 车型查询 - ");
|
|
|
|
|
|
|
+ String responseData = httpPostResultLog(gainXmlMapper(), m, YcBuildData.API_MODEL, "永诚API方式 - 车型查询(vin:"+carInfo.getVinNo()+") - ");
|
|
|
|
|
+ AssertionUtils.isEmpty(responseData,"永诚 车型查询接口响应返回空!");
|
|
|
// String responseData = apiLog.getResponseData();
|
|
// String responseData = apiLog.getResponseData();
|
|
|
log.info("===永诚--车型查询接口请求结束--" + carInfo.getLicenseNo() + "===");
|
|
log.info("===永诚--车型查询接口请求结束--" + carInfo.getLicenseNo() + "===");
|
|
|
ModelsQueryResponse rd = null;
|
|
ModelsQueryResponse rd = null;
|
|
|
try {
|
|
try {
|
|
|
String cleanStr = YcBuildData.cleanResponseStr(responseData);
|
|
String cleanStr = YcBuildData.cleanResponseStr(responseData);
|
|
|
- rd = xmlMapper.readValue(cleanStr, ModelsQueryResponse.class);
|
|
|
|
|
|
|
+ rd = gainXmlMapper().readValue(cleanStr, ModelsQueryResponse.class);
|
|
|
// List<ModelsQueryResponse.VehicleInfo> vehicleInfoList = buildCarModel(rd);
|
|
// List<ModelsQueryResponse.VehicleInfo> vehicleInfoList = buildCarModel(rd);
|
|
|
|
|
|
|
|
} catch (IOException e) {
|
|
} catch (IOException e) {
|
|
@@ -239,12 +239,7 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
|
|
|
|
|
|
|
|
//匹配的车辆信息数据 为空
|
|
//匹配的车辆信息数据 为空
|
|
|
if (CollUtil.isEmpty(vehicleInfoList)) {
|
|
if (CollUtil.isEmpty(vehicleInfoList)) {
|
|
|
-
|
|
|
|
|
buildCarInfo(carInfo, rd.getVehicleInfoList().get(0));
|
|
buildCarInfo(carInfo, rd.getVehicleInfoList().get(0));
|
|
|
-// carInfo.setModelCode(rd.getVehicleInfoList().get(0).getVehicleId());
|
|
|
|
|
-//// carInfo.setCiModelCode(a.getModelCode());
|
|
|
|
|
-// carInfo.setCiCarName(rd.getVehicleInfoList().get(0).getVehicleName());
|
|
|
|
|
-// carInfo.setModelcname(rd.getVehicleInfoList().get(0).getVehicleName());
|
|
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -252,9 +247,6 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
|
|
|
ModelsQueryResponse.VehicleInfo matchVehicleInfo = vehicleInfoList.stream().filter(a -> a.getVehiclePrice().equals(carInfo.getPurchasePrice())).findFirst().orElse(null);
|
|
ModelsQueryResponse.VehicleInfo matchVehicleInfo = vehicleInfoList.stream().filter(a -> a.getVehiclePrice().equals(carInfo.getPurchasePrice())).findFirst().orElse(null);
|
|
|
if (null != matchVehicleInfo) {
|
|
if (null != matchVehicleInfo) {
|
|
|
buildCarInfo(carInfo, matchVehicleInfo);
|
|
buildCarInfo(carInfo, matchVehicleInfo);
|
|
|
-// carInfo.setModelCode(matchVehicleInfo.getVehicleId());
|
|
|
|
|
-// carInfo.setCiCarName(matchVehicleInfo.getVehicleName());
|
|
|
|
|
-// carInfo.setModelcname(matchVehicleInfo.getVehicleName());
|
|
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -264,12 +256,7 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
|
|
|
.thenComparing((o1, o2) -> Integer.compare(StringUtils.toInt(o2.getVehiclePrice()), StringUtils.toInt(o1.getVehiclePrice()))).reversed())
|
|
.thenComparing((o1, o2) -> Integer.compare(StringUtils.toInt(o2.getVehiclePrice()), StringUtils.toInt(o1.getVehiclePrice()))).reversed())
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
|
|
-
|
|
|
|
|
buildCarInfo(carInfo, vehicleInfoList.get(0));
|
|
buildCarInfo(carInfo, vehicleInfoList.get(0));
|
|
|
-// carInfo.setModelCode(vehicleInfoList.get(0).getVehicleId());
|
|
|
|
|
-// carInfo.setCiCarName(vehicleInfoList.get(0).getVehicleName());
|
|
|
|
|
-// carInfo.setModelcname(vehicleInfoList.get(0).getVehicleName());
|
|
|
|
|
-
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|