From 3dee95286d41fc6df96ec8d9fe823498dcb0d745 Mon Sep 17 00:00:00 2001 From: wangwenyan Date: Thu, 7 Nov 2024 14:52:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=B9=E9=85=8D=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddressController.java | 1 + .../fangjia/open/model/AddesssMatchModel.java | 9 ++++++++ .../address/AddressParserServiceImpl.java | 23 ++++++++++++++++++- .../fangjia/service/address/mode/Address.java | 9 ++++++++ .../service/address/mode/MatchParams.java | 10 +++++++- 5 files changed, 50 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index a484fd8cf..d99ec101b 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java @@ -619,6 +619,7 @@ public class AddressController { params.setProvince(model.getProvince()); params.setUseMap(model.isUseMap()); params.setDebugName(model.getDebugName()); + params.setPropertyType(model.getPropertyType()); long start = System.currentTimeMillis(); Building building = addressParserService.parser(params); long end = System.currentTimeMillis(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java index 1a8907341..6feef4517 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java @@ -22,6 +22,7 @@ public class AddesssMatchModel extends FangjiaApiModel { private boolean useMap; private String address_1; private String address_2; + private String propertyType; private String showCode; @@ -153,4 +154,12 @@ public class AddesssMatchModel extends FangjiaApiModel { public void setShowCode(String showCode) { this.showCode = showCode; } + + public String getPropertyType() { + return propertyType; + } + + public void setPropertyType(String propertyType) { + this.propertyType = propertyType; + } } 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 c7c6b08a6..c9c7a6211 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 @@ -10,6 +10,7 @@ import com.fangjia.dal.mongo.fangjia.model.ServerArea; import com.fangjia.dal.mongo.model.bkoff.HouseLoudong; import com.fangjia.dal.mongo.model.bkoff.Loudong; import com.fangjia.dal.seaweed.dao.SeaweedDao; +import com.fangjia.dal.seaweed.model.District; import com.fangjia.dal.seaweed.model.Seaweed; import com.fangjia.service.address.mode.*; import com.fangjia.service.address.processor.AddressDistrictProcessors; @@ -436,8 +437,27 @@ public class AddressParserServiceImpl implements AddressParserService { AddressScoreResult scoreResult = findMatchedMetaData(addr, buildingType, metaDataType); if(scoreResult.getResult().size() > 0){ AddressMatchMetaData matchedMate = scoreResult.getResult().get(0); + + if(matchedMate.getMetaDataType() == MetaDataType.CPDB){ - return new Building(districtService.findById(matchedMate.getId(), MATCH_PROPERTY_FIELDS), scoreResult.getScore(matchedMate)); + District district = districtService.findById(matchedMate.getId(), MATCH_PROPERTY_FIELDS); + if("1".equals(addr.getPropertyType())){ + if(!district.getEstateType2().equals("别墅") || !district.getName().endsWith("别墅")){ + District districtNew = districtService.findDistrict(new DistrictKey(district.getCity(), district.getRegion(), district.getName() + "别墅"), district.getCategory()); + if(districtNew != null){ + 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()); + if(districtNew != null){ + district = districtNew; + } + } + } + return new Building(districtService.findById(district.getId(), MATCH_PROPERTY_FIELDS), scoreResult.getScore(matchedMate)); }else{ return new Building(matchedMate, scoreResult.getScore(matchedMate)); } @@ -500,6 +520,7 @@ public class AddressParserServiceImpl implements AddressParserService { addr.setProvince(params.getProvince()); addr.setDebugName(params.getDebugName()); addr.setUseMap(params.isUseMap()); + addr.setPropertyType(params.getPropertyType()); return AddressProcessors.process(addr); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java index 02cee4b25..d7cb876aa 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java @@ -15,6 +15,7 @@ import java.util.*; */ public class Address { + private String propertyType; private String province; private String city; private String district; @@ -769,6 +770,14 @@ public class Address { this.geoRegion = geoRegion; } + public String getPropertyType() { + return propertyType; + } + + public void setPropertyType(String propertyType) { + this.propertyType = propertyType; + } + @Override public String toString() { return "Address{" + diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/MatchParams.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/MatchParams.java index e53c9701f..bcff0e11b 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/MatchParams.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/MatchParams.java @@ -14,7 +14,7 @@ public class MatchParams { private String suggestName; /**调试时断点小区名*/ private String debugName; - + private String propertyType; /**用户输入地址*/ private String address; /**建筑类型解析出对应的建筑物*/ @@ -135,4 +135,12 @@ public class MatchParams { public void setDebugName(String debugName) { this.debugName = debugName; } + + public String getPropertyType() { + return propertyType; + } + + public void setPropertyType(String propertyType) { + this.propertyType = propertyType; + } }