Merge branch 'master' of http://gitlab.fangjia.com/dev0/main into open_gj
This commit is contained in:
+40
-3
@@ -1691,7 +1691,14 @@ public class AddressController {
|
||||
}
|
||||
String result = addressMatchProxyService.standard(convertModelToMap(model));
|
||||
if (result != null) {
|
||||
mav.setModel(result);
|
||||
JSONObject json = JSONObject.fromObject(result);
|
||||
int code = json.getInt("code");
|
||||
String msg = json.getString("msg");
|
||||
BasicModel basicModel = new BasicModel(code, msg);
|
||||
if(json.containsKey("result")){
|
||||
basicModel.setResult(json.get("result"));
|
||||
}
|
||||
mav.setModel(basicModel);
|
||||
} else {
|
||||
mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中..."));
|
||||
}
|
||||
@@ -1730,16 +1737,20 @@ public class AddressController {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("地址不能为空"));
|
||||
return mav;
|
||||
}
|
||||
if (StringUtils.isBlank(model.getCity())) {
|
||||
/*if (StringUtils.isBlank(model.getCity())) {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("城市不能为空"));
|
||||
return mav;
|
||||
}
|
||||
}*/
|
||||
MatchParams matchParams = new MatchParams();
|
||||
matchParams.setCity(model.getCity());
|
||||
matchParams.setAddress(model.getAddress());
|
||||
matchParams.setAddressParserGoal(AddressParserGoal.Match);
|
||||
matchParams.setPreciseLevel(PreciseLevel.STRICT);
|
||||
matchParams.setProvince(model.getProvince());
|
||||
|
||||
// matchParams.setUseMap(true);
|
||||
matchParams.setUseAliyunApi(true);
|
||||
matchParams.setContainsLocation(model.isContainsLocation());
|
||||
Building building = addressParserService.standard(matchParams);
|
||||
Address address = building.getSearchAddress();
|
||||
UniversalDto dto = UniversalDto.newDto();
|
||||
@@ -1755,10 +1766,36 @@ public class AddressController {
|
||||
dto.append("street", address.getStreet());
|
||||
dto.append("streetNumber", address.getStreetNumber());
|
||||
dto.append("name", building.getSuggestName());
|
||||
if(StringUtils.isBlank(building.getSuggestName())){
|
||||
if(StringUtils.isNotBlank(address.getParsedPropertyName())){
|
||||
dto.append("name", address.getParsedPropertyName());
|
||||
}else if(StringUtils.isNotBlank(address.getOrgKeywords())){
|
||||
dto.append("name", address.getOrgKeywords());
|
||||
}
|
||||
}
|
||||
if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){
|
||||
String addr = building.getAddress();
|
||||
String street = AddressParserUtil.extractStreet(addr);
|
||||
if(street != null){
|
||||
dto.append("street", street);
|
||||
if(addr.length() != street.length()){
|
||||
dto.append("streetNumber", AddressParserUtil.match(AddressParserUtil.STREET_NUMBER_CONNECTOR_PATTERN, addr));
|
||||
}
|
||||
}else if(StringUtils.isNotBlank(building.getStreet())){
|
||||
dto.append("street", building.getStreet());
|
||||
if(StringUtils.isNotBlank(building.getStreetno())){
|
||||
dto.append("streetNumber", building.getStreetno());
|
||||
}
|
||||
}
|
||||
}
|
||||
dto.append("buildingNumber", address.getBuildingNumber());
|
||||
dto.append("unitNumber", address.getUnitNumber());
|
||||
dto.append("roomNumber", address.getRoomNumber());
|
||||
dto.append("formattedAddress", address.getFormattedAddress());
|
||||
if(matchParams.isContainsLocation()){
|
||||
dto.append("lat", building.getLat());
|
||||
dto.append("lng", building.getLng());
|
||||
}
|
||||
mav.setModel(BasicModel.buildOKModel().setResult(dto));
|
||||
return mav;
|
||||
}
|
||||
|
||||
@@ -19,6 +19,16 @@ public class AddesssMatchModel extends FangjiaApiModel {
|
||||
private String province;
|
||||
private String debugName;
|
||||
private boolean useMap;
|
||||
|
||||
public boolean isContainsLocation() {
|
||||
return containsLocation;
|
||||
}
|
||||
|
||||
public void setContainsLocation(boolean containsLocation) {
|
||||
this.containsLocation = containsLocation;
|
||||
}
|
||||
|
||||
private boolean containsLocation;
|
||||
private boolean debug;
|
||||
public String getCity() {
|
||||
return city;
|
||||
|
||||
@@ -36,7 +36,15 @@ public class AddressModel extends FangjiaApiModel {
|
||||
private Integer pageNo;
|
||||
// 是否用于检查
|
||||
private String dataLevel;
|
||||
public boolean isContainsLocation() {
|
||||
return containsLocation;
|
||||
}
|
||||
|
||||
public void setContainsLocation(boolean containsLocation) {
|
||||
this.containsLocation = containsLocation;
|
||||
}
|
||||
|
||||
private boolean containsLocation;
|
||||
public boolean isIncludeMaps() {
|
||||
return includeMaps;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user