diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java index c3b82f22c..6f6590ee0 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java @@ -320,10 +320,8 @@ public class AddressParserServiceImpl implements AddressParserService { Building findMatchedBuilding(Address addr,BuildingType buildingType, MetaDataType metaDataType){ AddressScoreResult scoreResult = findMatchedMetaData(addr, buildingType, metaDataType); - if(scoreResult.getResult().size() > 0){ + if(!scoreResult.getResult().isEmpty()){ AddressMatchMetaData matchedMate = scoreResult.getResult().get(0); - - if(matchedMate.getMetaDataType() == MetaDataType.CPDB){ District district = districtService.findById(matchedMate.getId(), MATCH_PROPERTY_FIELDS); if("1".equals(addr.getPropertyType())){ @@ -333,7 +331,6 @@ public class AddressParserServiceImpl implements AddressParserService { district = districtNew; } } - }else if("2".equals(addr.getPropertyType())){ if(!district.getEstateType2().equals("商住") || !district.getName().endsWith("商住楼")){ District districtNew = districtService.findDistrict(new DistrictKey(district.getCity(), district.getRegion(), district.getName() + "商住楼"), district.getCategory()); @@ -342,7 +339,11 @@ public class AddressParserServiceImpl implements AddressParserService { } } } - return new Building(districtService.findById(district.getId(), MATCH_PROPERTY_FIELDS), scoreResult.getScore(matchedMate)); + district = districtService.findById(district.getId(), MATCH_PROPERTY_FIELDS); + if(district == null){ + logger.error("未找到匹配的CPDB数据:" + addr + "ID:" + district.getId()); + } + return new Building(district, scoreResult.getScore(matchedMate)); }else{ return new Building(matchedMate, scoreResult.getScore(matchedMate)); }