diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GuzhiController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GuzhiController.java
new file mode 100644
index 000000000..c3d1c6116
--- /dev/null
+++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GuzhiController.java
@@ -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;
+ }
+}
diff --git a/projects/fangjia-coresite/src/main/webapp/company/about.ftl b/projects/fangjia-coresite/src/main/webapp/company/about.ftl
index 0f386bf92..b1af2a8cc 100644
--- a/projects/fangjia-coresite/src/main/webapp/company/about.ftl
+++ b/projects/fangjia-coresite/src/main/webapp/company/about.ftl
@@ -124,7 +124,7 @@
-
+<#-- -->
diff --git a/projects/fangjia-coresite/src/main/webapp/guzhi/map.ftl b/projects/fangjia-coresite/src/main/webapp/guzhi/map.ftl
new file mode 100644
index 000000000..4b013115e
--- /dev/null
+++ b/projects/fangjia-coresite/src/main/webapp/guzhi/map.ftl
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+ 基本热力图
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java
index aba3d131b..d323f797b 100644
--- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java
+++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java
@@ -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> 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())