|
@@ -50,24 +50,26 @@ public class AddressQueryEngine {
|
|
}
|
|
}
|
|
AddressResult addressResult = new AddressResult();
|
|
AddressResult addressResult = new AddressResult();
|
|
List<AddressResult.ContentBean> contentBeans = new ArrayList<>();
|
|
List<AddressResult.ContentBean> contentBeans = new ArrayList<>();
|
|
-// try {
|
|
|
|
-// for (String addr : addrs) {
|
|
|
|
-// AddressResult.ContentBean contentBean = verificaData(wdjaSearchByName(addr), level, addr);
|
|
|
|
-// if (contentBean != null) {
|
|
|
|
-// contentBeans.add(contentBean);
|
|
|
|
-// addressResult.setData(contentBeans);
|
|
|
|
-// addressResult.setCode(AddressResultEnum.WDJA_SUCCESS);
|
|
|
|
-// addressResult.setMessage("成功");
|
|
|
|
-// return addressResult;
|
|
|
|
-// }
|
|
|
|
-// }
|
|
|
|
-// } catch (Exception e) {
|
|
|
|
-// System.err.println("武大吉奥:日常异常" + e);
|
|
|
|
-// }
|
|
|
|
|
|
+ /*try {
|
|
|
|
+ for (String addr : addrs) {
|
|
|
|
+ AddressResult.ContentBean contentBean = verificaData(wdjaSearchByName(addr), level, addr);
|
|
|
|
+ if (contentBean != null) {
|
|
|
|
+ contentBean.setSearchAddress(addr);
|
|
|
|
+ contentBeans.add(contentBean);
|
|
|
|
+ addressResult.setData(contentBeans);
|
|
|
|
+ addressResult.setCode(AddressResultEnum.WDJA_SUCCESS);
|
|
|
|
+ addressResult.setMessage("成功");
|
|
|
|
+ return addressResult;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ System.err.println("武大吉奥:日常异常" + e);
|
|
|
|
+ }*/
|
|
if (addressResult.getData() == null || addressResult.getData().size() == 0) {
|
|
if (addressResult.getData() == null || addressResult.getData().size() == 0) {
|
|
for (String addr : addrs) {
|
|
for (String addr : addrs) {
|
|
AddressResult.ContentBean contentBean = verificaData(szxSearchByName(addr), level, addr);
|
|
AddressResult.ContentBean contentBean = verificaData(szxSearchByName(addr), level, addr);
|
|
if (contentBean != null) {
|
|
if (contentBean != null) {
|
|
|
|
+ contentBean.setSearchAddress(addr);
|
|
contentBeans.add(contentBean);
|
|
contentBeans.add(contentBean);
|
|
addressResult.setData(contentBeans);
|
|
addressResult.setData(contentBeans);
|
|
addressResult.setCode(AddressResultEnum.SZX_SUCCESS);
|
|
addressResult.setCode(AddressResultEnum.SZX_SUCCESS);
|
|
@@ -80,6 +82,7 @@ public class AddressQueryEngine {
|
|
for (String addr : addrs) {
|
|
for (String addr : addrs) {
|
|
AddressResult.ContentBean contentBean = verificaData(gdSearchByName(addr), level, addr);
|
|
AddressResult.ContentBean contentBean = verificaData(gdSearchByName(addr), level, addr);
|
|
if (contentBean != null) {
|
|
if (contentBean != null) {
|
|
|
|
+ contentBean.setSearchAddress(addr);
|
|
contentBeans.add(contentBean);
|
|
contentBeans.add(contentBean);
|
|
addressResult.setData(contentBeans);
|
|
addressResult.setData(contentBeans);
|
|
addressResult.setCode(AddressResultEnum.GD_SUCCESS);
|
|
addressResult.setCode(AddressResultEnum.GD_SUCCESS);
|
|
@@ -92,6 +95,7 @@ public class AddressQueryEngine {
|
|
for (String addr : addrs) {
|
|
for (String addr : addrs) {
|
|
AddressResult.ContentBean contentBean = verificaData(gdV3SearchByName(addr), level, addr);
|
|
AddressResult.ContentBean contentBean = verificaData(gdV3SearchByName(addr), level, addr);
|
|
if (contentBean != null) {
|
|
if (contentBean != null) {
|
|
|
|
+ contentBean.setSearchAddress(addr);
|
|
contentBeans.add(contentBean);
|
|
contentBeans.add(contentBean);
|
|
addressResult.setData(contentBeans);
|
|
addressResult.setData(contentBeans);
|
|
addressResult.setCode(AddressResultEnum.GDV3_SUCCESS);
|
|
addressResult.setCode(AddressResultEnum.GDV3_SUCCESS);
|
|
@@ -145,7 +149,7 @@ public class AddressQueryEngine {
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
public AddressResult szxSearchByName(String address) {
|
|
public AddressResult szxSearchByName(String address) {
|
|
- ResponseEntity response = AddressNetTools.getInstance().requestGet(Constant.SZX_URL + "®ion=" + Constant.getAMAP_CITY_CODE() + "&query=" + address, null, null);
|
|
|
|
|
|
+ ResponseEntity response = AddressNetTools.getInstance().requestGet(Constant.SZX_URL + "®ion=" + Constant.getAMAP_CITY_CODE() + "&query=" + address, null, null, 10);
|
|
if (response != null) {
|
|
if (response != null) {
|
|
String body = response.getBody() + "";
|
|
String body = response.getBody() + "";
|
|
if (!StringUtils.hasText(body))
|
|
if (!StringUtils.hasText(body))
|
|
@@ -188,7 +192,7 @@ public class AddressQueryEngine {
|
|
*/
|
|
*/
|
|
public AddressResult gdSearchByName(String address) {
|
|
public AddressResult gdSearchByName(String address) {
|
|
String geoUrl = Constant.AMAP_GEO_URL + "?key=" + Constant.AMAP_KEY + "&address=" + address + "&city=" + Constant.getAMAP_CITY_CODE() + "&output=JSON";
|
|
String geoUrl = Constant.AMAP_GEO_URL + "?key=" + Constant.AMAP_KEY + "&address=" + address + "&city=" + Constant.getAMAP_CITY_CODE() + "&output=JSON";
|
|
- ResponseEntity response = AddressNetTools.getInstance().requestGet(geoUrl, null, null);
|
|
|
|
|
|
+ ResponseEntity response = AddressNetTools.getInstance().requestGet(geoUrl, null, null, 0);
|
|
if (response != null && response.getBody() != null) {
|
|
if (response != null && response.getBody() != null) {
|
|
String body = response.getBody() + "";
|
|
String body = response.getBody() + "";
|
|
if (!StringUtils.hasText(body))
|
|
if (!StringUtils.hasText(body))
|
|
@@ -214,7 +218,7 @@ public class AddressQueryEngine {
|
|
String geoUrl =
|
|
String geoUrl =
|
|
Constant.AMAP_SEARCH_NAME_V3 + "?key=" + Constant.AMAP_KEY + "&types=" + Constant.AMAP_SEARCH_TYPES +
|
|
Constant.AMAP_SEARCH_NAME_V3 + "?key=" + Constant.AMAP_KEY + "&types=" + Constant.AMAP_SEARCH_TYPES +
|
|
"&keywords=" + address + "&city=" + Constant.getAMAP_CITY_CODE() + "&offset=20";
|
|
"&keywords=" + address + "&city=" + Constant.getAMAP_CITY_CODE() + "&offset=20";
|
|
- ResponseEntity responseEntity = AddressNetTools.getInstance().requestGet(geoUrl, null, null);
|
|
|
|
|
|
+ ResponseEntity responseEntity = AddressNetTools.getInstance().requestGet(geoUrl, null, null, 0);
|
|
if (responseEntity.hasBody()) {
|
|
if (responseEntity.hasBody()) {
|
|
String body = responseEntity.getBody() + "";
|
|
String body = responseEntity.getBody() + "";
|
|
if (!StringUtils.hasText(body)) {
|
|
if (!StringUtils.hasText(body)) {
|
|
@@ -232,7 +236,7 @@ public class AddressQueryEngine {
|
|
geoUrl =
|
|
geoUrl =
|
|
Constant.AMAP_SEARCH_NAME_V3 + "?key=" + Constant.AMAP_KEY + "&types=" + Constant.AMAP_SEARCH_TYPES +
|
|
Constant.AMAP_SEARCH_NAME_V3 + "?key=" + Constant.AMAP_KEY + "&types=" + Constant.AMAP_SEARCH_TYPES +
|
|
"&keywords=" + address + "&city=" + Constant.getAMAP_CITY_CODE() + "&offset=20&page=" + i;
|
|
"&keywords=" + address + "&city=" + Constant.getAMAP_CITY_CODE() + "&offset=20&page=" + i;
|
|
- ResponseEntity responseEntity2 = AddressNetTools.getInstance().requestGet(geoUrl, null, null);
|
|
|
|
|
|
+ ResponseEntity responseEntity2 = AddressNetTools.getInstance().requestGet(geoUrl, null, null, 0);
|
|
if (responseEntity2.hasBody()) {
|
|
if (responseEntity2.hasBody()) {
|
|
body = responseEntity2.getBody() + "";
|
|
body = responseEntity2.getBody() + "";
|
|
}
|
|
}
|
|
@@ -413,13 +417,13 @@ public class AddressQueryEngine {
|
|
}
|
|
}
|
|
|
|
|
|
public static String addressReplaceAll(String address) {
|
|
public static String addressReplaceAll(String address) {
|
|
- return address.replaceAll("上海市", "").replaceAll(Constant.getArea(), "").replaceAll("区", "").replaceAll("-", "").replaceAll("_", "").replaceAll("/", "").replaceAll(" ", "").replaceAll(",", "").replaceAll("\\.", "").replaceAll(",", "").replaceAll("。", "").replaceAll("\\+", "").replaceAll("\\*", "");
|
|
|
|
|
|
+ return address.replaceAll("上海市", "").replaceAll(Constant.getArea() + "区", "").replaceAll("-", "").replaceAll("_", "").replaceAll("/", "").replaceAll(" ", "").replaceAll(",", "").replaceAll("\\.", "").replaceAll(",", "").replaceAll("。", "").replaceAll("\\+", "").replaceAll("\\*", "");
|
|
}
|
|
}
|
|
|
|
|
|
public static String townReplaceAll(String address) {
|
|
public static String townReplaceAll(String address) {
|
|
String[] towns = Constant.getTowns();
|
|
String[] towns = Constant.getTowns();
|
|
for (String town : towns) {
|
|
for (String town : towns) {
|
|
- address.replaceAll(town, "");
|
|
|
|
|
|
+ address = address.replaceAll(town, "");
|
|
}
|
|
}
|
|
return address.replaceAll("号", "0").replaceAll("弄", "0").replaceAll("室", "0").replaceAll("户", "0").replaceAll("单元", "0").replaceAll("幢", "0");
|
|
return address.replaceAll("号", "0").replaceAll("弄", "0").replaceAll("室", "0").replaceAll("户", "0").replaceAll("单元", "0").replaceAll("幢", "0");
|
|
}
|
|
}
|