Merge remote-tracking branch 'origin/master'
This commit is contained in:
+10
@@ -0,0 +1,10 @@
|
||||
package com.fangjia.coresite.controllers;
|
||||
|
||||
import com.fangjia.coresite.model.FangjiaModel;
|
||||
|
||||
public class GuzhiController {
|
||||
|
||||
public FangjiaModel mapAction(FangjiaModel model){
|
||||
return model;
|
||||
}
|
||||
}
|
||||
@@ -124,7 +124,7 @@
|
||||
<a class="partner11"></a>
|
||||
<a class="partner12"></a>
|
||||
<a class="partner13"></a>
|
||||
<a class="partner14"></a>
|
||||
<#-- <a class="partner14"></a>-->
|
||||
<a class="partner15"></a>
|
||||
<a class="partner16" style="margin-right:0;"></a>
|
||||
<a class="partner21"></a>
|
||||
|
||||
File diff suppressed because one or more lines are too long
+35
-23
@@ -168,7 +168,7 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
if(params.isUseAliyunApi()){
|
||||
aliyunBo = aliyunService.addressStand(params.getAddress(), params.getCity());
|
||||
if(aliyunBo != null){
|
||||
String poi = (aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi());
|
||||
String poi = ((aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi())).replaceAll("\\s*", "");
|
||||
addr.setKeywords(poi);
|
||||
if(StringUtils.isNotBlank(aliyunBo.getCity())){
|
||||
addr.setSuggestCity(aliyunBo.getCity());
|
||||
@@ -197,27 +197,27 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
* @return
|
||||
*/
|
||||
void completBuildingField(Building matchedBuilding, AliyunBo aliyunBo, MatchParams params){
|
||||
String poi = (aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi());
|
||||
if(matchedBuilding.getSuggestName()!=null && StringUtils.isNotBlank(poi) && params.getAddress().contains(poi)){
|
||||
String poi = ((aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi())).replaceAll("\\s*", "");
|
||||
if(StringUtils.isBlank(matchedBuilding.getSuggestName())){
|
||||
matchedBuilding.setSuggestName(poi);
|
||||
}else if(matchedBuilding.getSuggestName()!=null && StringUtils.isNotBlank(poi) && params.getAddress().contains(poi)){
|
||||
if(!params.getAddress().contains(matchedBuilding.getSuggestName()) || poi.contains(matchedBuilding.getSuggestName())){
|
||||
matchedBuilding.setSuggestName(poi);
|
||||
}
|
||||
}
|
||||
if(StringUtils.isBlank(matchedBuilding.getProvince())){
|
||||
matchedBuilding.setProvince(aliyunBo.getProv());
|
||||
}
|
||||
if(StringUtils.isBlank(matchedBuilding.getCity())){
|
||||
matchedBuilding.setCity(aliyunBo.getCity());
|
||||
}
|
||||
matchedBuilding.setStreet(aliyunBo.getRoad());
|
||||
matchedBuilding.setStreetno(aliyunBo.getRoadno());
|
||||
|
||||
Address addr = matchedBuilding.getSearchAddress();
|
||||
if(StringUtils.isBlank(addr.getProvince())){
|
||||
addr.setProvince(formatProvince(aliyunBo.getProv()));
|
||||
}
|
||||
if(StringUtils.isBlank(addr.getCity())){
|
||||
addr.setCity(RegionData.formatCity(aliyunBo.getCity()));
|
||||
}
|
||||
|
||||
if(StringUtils.isBlank(addr.getDevelopmentZone())){
|
||||
addr.setDevelopmentZone(aliyunBo.getDevzone());
|
||||
}
|
||||
if(StringUtils.isBlank(addr.getDistrict())){
|
||||
addr.setDistrict(aliyunBo.getDistrict());
|
||||
addr.setDistrict(RegionData.formatRegion(aliyunBo.getDistrict()));
|
||||
}
|
||||
if(StringUtils.isBlank(addr.getTownship())){
|
||||
addr.setTownship(aliyunBo.getTown());
|
||||
@@ -231,9 +231,28 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
if(StringUtils.isBlank(addr.getRoomNumber())){
|
||||
addr.setRoomNumber(aliyunBo.getRoomno());
|
||||
}
|
||||
if(StringUtils.isBlank(addr.getStreet())){
|
||||
addr.setStreet(aliyunBo.getRoad());
|
||||
}
|
||||
if(StringUtils.isBlank(addr.getStreetNumber())){
|
||||
addr.setStreetNumber(aliyunBo.getRoadno());
|
||||
}
|
||||
matchedBuilding.setSearchAddress(addr);
|
||||
}
|
||||
|
||||
String formatProvince(String province){
|
||||
if(StringUtils.isBlank(province)){
|
||||
return province;
|
||||
}
|
||||
Map<String, List<String>> provinceData = ProvinceData.getAllProvince();
|
||||
for (String name : provinceData.keySet()) {
|
||||
if(province.contains(name)){
|
||||
return name;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
Building findMatchedBuilding(Address addr,BuildingType buildingType, MetaDataType metaDataType){
|
||||
|
||||
AddressScoreResult scoreResult = findMatchedMetaData(addr, buildingType, metaDataType);
|
||||
@@ -914,15 +933,13 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
if(StringUtils.isNotBlank(address.getStreet())){
|
||||
formattedAddressBuilder.append(address.getStreet());
|
||||
}
|
||||
if("上海".equals(address.getCity()) && StringUtils.isNotBlank(address.getStreet()) && !address.getStreet().endsWith("弄")){
|
||||
if(StringUtils.isNotBlank(address.getStreetNumber())){
|
||||
formattedAddressBuilder.append(address.getStreetNumber());
|
||||
}
|
||||
if(StringUtils.isNotBlank(address.getStreet()) && StringUtils.isNotBlank(address.getStreetNumber())){
|
||||
formattedAddressBuilder.append(address.getStreetNumber());
|
||||
}
|
||||
if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){
|
||||
formattedAddressBuilder.append(building.getAddress());
|
||||
}
|
||||
if(StringUtils.isNotBlank(building.getSuggestName()) && building.getSuggestName().equals(address.getOrgKeywords())){
|
||||
if(StringUtils.isNotBlank(building.getSuggestName())){
|
||||
formattedAddressBuilder.append(building.getSuggestName());
|
||||
}
|
||||
if(StringUtils.isBlank(building.getSuggestName())){
|
||||
@@ -932,11 +949,6 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
formattedAddressBuilder.append(address.getOrgKeywords());
|
||||
}
|
||||
}
|
||||
if("上海".equals(address.getCity()) && StringUtils.isNotBlank(address.getStreet()) && address.getStreet().endsWith("弄")){
|
||||
if(StringUtils.isNotBlank(address.getStreetNumber())){
|
||||
formattedAddressBuilder.append(address.getStreetNumber());
|
||||
}
|
||||
}
|
||||
if(StringUtils.isNotBlank(address.getOrgBuildingNumber())){
|
||||
if(StringUtils.isNotBlank(address.getStreet()) && address.getStreet().endsWith("弄")
|
||||
&& StringUtils.isNotBlank(address.getStreetNumber())
|
||||
|
||||
Reference in New Issue
Block a user