diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 2e741bfef..f22a692fa 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -39,6 +39,7 @@ import com.fangjia.dal.seawater.model.Seawater; import com.fangjia.open.dto.*; import com.fangjia.open.dto.addressGovernance.StructureDto; import com.fangjia.open.util.CommonDtoUtils; +import com.fangjia.service.address.AddressParserUtil; import com.fangjia.service.district.*; import com.fangjia.service.mongo.fangjia.*; import com.fangjia.service.open.*; @@ -186,7 +187,7 @@ public class PropertyController { private FileDao fileDao = FileDao.getInstance(); private static final int DEFAULT_PAGE_SIZE = 20; - private static final String[] PROPERTY_SEARCH_API_FIELDS = { "address", "city", "region", "name", "lat2", "lng2","lat", "lng", "block", "estateType2", "addrAlias" }; + private static final String[] PROPERTY_SEARCH_API_FIELDS = { "address", "city", "region", "name", "lat2", "lng2","lat", "lng", "block", "estateType2", "addrAlias", "alias" }; static final int BAI_DU_GEO = 1;// 百度系坐标 static final int GAO_DE_GEO = 2;// 高德系坐标 @@ -609,6 +610,25 @@ public class PropertyController { dto.setBlock(district.getBlock()); } dto.setPropertyType(district.getEstateType2()); + if (CollectionUtils.isNotEmpty(district.getAlias())) { + // 将最相近的别名输出给用户 + String alias = null; + double similarity = 0; + if (StringUtils.isNotBlank(model.getKeyword())) { + for (String mappingAlias : district.getAlias()) { + double curr = AddressParserUtil.getSimilarityRatio(mappingAlias, model.getKeyword()); + if (curr > similarity ) { + similarity = curr; + alias = mappingAlias; + } + } + } + if (StringUtils.isNotBlank(alias)) { + dto.setAlias(alias); + } else { + dto.setAlias(district.getAlias().get(0)); + } + } list.add(dto); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/PropertyDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/PropertyDto.java index 8e9097e2a..aac0f83b2 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/PropertyDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/PropertyDto.java @@ -15,6 +15,10 @@ public class PropertyDto { private String propertyType; private String block; private String distance; + /** + * 新增小区别名 + */ + private String alias; public String getId() { return id; } @@ -88,4 +92,12 @@ public class PropertyDto { public void setDistance(String distance) { this.distance = distance; } + + public String getAlias() { + return alias; + } + + public void setAlias(String alias) { + this.alias = alias; + } }