|
|
|
@@ -89,6 +89,7 @@ import com.fangjia.service.mongo.fangjia.ServerAreaService;
|
|
|
|
|
import com.fangjia.service.open.WaitCrawlKeywordsService;
|
|
|
|
|
import com.fangjia.service.sql.FjtEvaluationService;
|
|
|
|
|
import com.fangjia.service.web.AddressService;
|
|
|
|
|
import org.sothis.web.mvc.annotation.Param;
|
|
|
|
|
|
|
|
|
|
@Authority(role = Role.USER)
|
|
|
|
|
public class AddressController {
|
|
|
|
@@ -106,6 +107,7 @@ public class AddressController {
|
|
|
|
|
private HouseLoudongService houseLoudongService;
|
|
|
|
|
private FjtEvaluationService fjtEvaluationService;
|
|
|
|
|
private AddressMatchProxyService addressMatchProxyService;
|
|
|
|
|
|
|
|
|
|
private final static String AK = OpenConfig.getConfig().getBaiduAk();
|
|
|
|
|
private final static Logger LOGGER = LoggerFactory.getLogger(AddressController.class);
|
|
|
|
|
|
|
|
|
@@ -117,6 +119,8 @@ public class AddressController {
|
|
|
|
|
private static final String GRADE_NATION = "全国评分";
|
|
|
|
|
private static final String GRADE_CONSUME = "消费评分";
|
|
|
|
|
|
|
|
|
|
public final static OpenConfig CONFIG = OpenConfig.getConfig();
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @deprecated see parse2Action
|
|
|
|
|
* @param model
|
|
|
|
@@ -1705,6 +1709,139 @@ public class AddressController {
|
|
|
|
|
return mav;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 地址标准化接口V2
|
|
|
|
|
*
|
|
|
|
|
* @param model
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public Object standard2Action(AddesssMatchModel model) {
|
|
|
|
|
|
|
|
|
|
RestfulModelAndView mav = new RestfulModelAndView();
|
|
|
|
|
if (StringUtils.isBlank(model.getAddress())) {
|
|
|
|
|
mav.setModel(BasicModel.buildBadRequestModel("地址不能为空"));
|
|
|
|
|
return mav;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
HttpRequest request = new HttpRequest();
|
|
|
|
|
JSONObject json = null;
|
|
|
|
|
Map<String, String> params = new HashMap<String, String>();
|
|
|
|
|
params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity());
|
|
|
|
|
params.put("address", model.getAddress());
|
|
|
|
|
try{
|
|
|
|
|
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8");
|
|
|
|
|
} catch(Exception e){
|
|
|
|
|
try {
|
|
|
|
|
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8");
|
|
|
|
|
} catch(Exception ex){
|
|
|
|
|
ex.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (json != null) {
|
|
|
|
|
int code = json.getInt("status");
|
|
|
|
|
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("服务升级中..."));
|
|
|
|
|
}
|
|
|
|
|
return mav;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 五级地址标准化接口
|
|
|
|
|
*
|
|
|
|
|
* @param model
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public Object fiveDivisionStructureAction(AddesssMatchModel model) {
|
|
|
|
|
|
|
|
|
|
RestfulModelAndView mav = new RestfulModelAndView();
|
|
|
|
|
if (StringUtils.isBlank(model.getAddress())) {
|
|
|
|
|
mav.setModel(BasicModel.buildBadRequestModel("地址不能为空"));
|
|
|
|
|
return mav;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
HttpRequest request = new HttpRequest();
|
|
|
|
|
JSONObject json = null;
|
|
|
|
|
Map<String, String> params = new HashMap<String, String>();
|
|
|
|
|
params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity());
|
|
|
|
|
params.put("address", model.getAddress());
|
|
|
|
|
// 地址验证无效也输出标准化结果
|
|
|
|
|
params.put("flag", "true");
|
|
|
|
|
try{
|
|
|
|
|
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure", params, "UTF-8");
|
|
|
|
|
} catch(Exception e){
|
|
|
|
|
try {
|
|
|
|
|
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure", params, "UTF-8");
|
|
|
|
|
} catch(Exception ex){
|
|
|
|
|
ex.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (json != null) {
|
|
|
|
|
int code = json.getInt("status");
|
|
|
|
|
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("服务升级中..."));
|
|
|
|
|
}
|
|
|
|
|
return mav;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 详细地址标准化接口
|
|
|
|
|
*
|
|
|
|
|
* @param model
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public Object divisionStructureAction(AddesssMatchModel model) {
|
|
|
|
|
|
|
|
|
|
RestfulModelAndView mav = new RestfulModelAndView();
|
|
|
|
|
if (StringUtils.isBlank(model.getAddress())) {
|
|
|
|
|
mav.setModel(BasicModel.buildBadRequestModel("地址不能为空"));
|
|
|
|
|
return mav;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
HttpRequest request = new HttpRequest();
|
|
|
|
|
JSONObject json = null;
|
|
|
|
|
Map<String, String> params = new HashMap<String, String>();
|
|
|
|
|
params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : "重庆市");
|
|
|
|
|
params.put("address", model.getAddress());
|
|
|
|
|
// 地址验证无效也输出标准化结果
|
|
|
|
|
params.put("flag", "true");
|
|
|
|
|
try{
|
|
|
|
|
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/divisionStructure", params, "UTF-8");
|
|
|
|
|
} catch(Exception e){
|
|
|
|
|
try {
|
|
|
|
|
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/divisionStructure", params, "UTF-8");
|
|
|
|
|
} catch(Exception ex){
|
|
|
|
|
ex.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (json != null) {
|
|
|
|
|
int code = json.getInt("status");
|
|
|
|
|
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("服务升级中..."));
|
|
|
|
|
}
|
|
|
|
|
return mav;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Object similarityAction(AddesssMatchModel model) {
|
|
|
|
|
RestfulModelAndView mav = new RestfulModelAndView();
|
|
|
|
|
if (StringUtils.isBlank(model.getAddress_1()) || StringUtils.isBlank(model.getAddress_2())) {
|
|
|
|
|