Merge branch 'feature_master_xh_standard' into 'master'
Feature master xh standard See merge request !5
This commit is contained in:
+4
@@ -3,6 +3,7 @@ package com.fangjia.service.address;
|
|||||||
import com.fangjia.core.RegionData;
|
import com.fangjia.core.RegionData;
|
||||||
import com.fangjia.core.util.DataUtil;
|
import com.fangjia.core.util.DataUtil;
|
||||||
import com.fangjia.core.util.GeoUtils;
|
import com.fangjia.core.util.GeoUtils;
|
||||||
|
import com.fangjia.core.util.StringUtil;
|
||||||
import com.fangjia.dal.QueryParam;
|
import com.fangjia.dal.QueryParam;
|
||||||
import com.fangjia.dal.common.DistrictKey;
|
import com.fangjia.dal.common.DistrictKey;
|
||||||
import com.fangjia.dal.common.ServerAreaData;
|
import com.fangjia.dal.common.ServerAreaData;
|
||||||
@@ -169,6 +170,9 @@ public class AddressParserServiceImpl implements AddressParserService {
|
|||||||
if(aliyunBo != null){
|
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());
|
||||||
addr.setKeywords(poi);
|
addr.setKeywords(poi);
|
||||||
|
if(StringUtils.isNotBlank(aliyunBo.getCity())){
|
||||||
|
addr.setSuggestCity(aliyunBo.getCity());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(params.isUseMap()){
|
if(params.isUseMap()){
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ public class Address {
|
|||||||
private String effectiveAddressPinYin;
|
private String effectiveAddressPinYin;
|
||||||
private String offset;
|
private String offset;
|
||||||
private String miniAddress;
|
private String miniAddress;
|
||||||
|
private String suggestCity;
|
||||||
private String suggestDistrict;
|
private String suggestDistrict;
|
||||||
private String suggestName;
|
private String suggestName;
|
||||||
private String suggestNamePinYin;
|
private String suggestNamePinYin;
|
||||||
@@ -302,6 +303,14 @@ public class Address {
|
|||||||
this.floor = floor;
|
this.floor = floor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getSuggestCity() {
|
||||||
|
return suggestCity;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSuggestCity(String suggestCity) {
|
||||||
|
this.suggestCity = suggestCity;
|
||||||
|
}
|
||||||
|
|
||||||
public String getLoopLine() {
|
public String getLoopLine() {
|
||||||
return loopLine;
|
return loopLine;
|
||||||
}
|
}
|
||||||
|
|||||||
+3
@@ -121,6 +121,9 @@ public class CityProcessor extends AbstractAddressProcessor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(StringUtils.isBlank(address.getCity())){
|
||||||
|
address.setCity(address.getSuggestCity());
|
||||||
|
}
|
||||||
return RepeatStatus.NEXT;
|
return RepeatStatus.NEXT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user