Merge branch 'open_v2' into 'master'

去掉高德逆解析

See merge request !1172
This commit is contained in:
2025-09-17 15:22:28 +08:00
@@ -36,28 +36,20 @@ public class CommercialController {
return mav;
}
//加上高德获取经纬度 和 根据经纬度估值
Map<String, String> map = GeoUtils.parserByGaode(null, model.getAddress());
if (map != null && map.containsKey("level") && GAODE_LEVEL.contains(map.get("level"))
&& map.containsKey("lng") && map.containsKey("lat")) {
String location = map.get("lng") + "," + map.get("lat");
JSONObject json = locationEvaluateApi(location, String.valueOf(model.getSize()), String.valueOf(model.getEstateType()));
if (json != null) {
if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) {
HashMap<String, Long> resultMap = new HashMap<String, Long>();
resultMap.put("avgPrice", Long.valueOf(json.getString("unitPrice")));
resultMap.put("totalPrice", Long.valueOf(json.getString("totalPrice")));
mav.setModel(BasicModel.buildOKModel().setResult(resultMap));
} else {
mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!"));
}
JSONObject json = locationEvaluateApi(model.getAddress(), model.getLocation(), String.valueOf(model.getSize()), String.valueOf(model.getEstateType()));
if (json != null) {
if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) {
HashMap<String, Long> resultMap = new HashMap<String, Long>();
resultMap.put("avgPrice", Long.valueOf(json.getString("unitPrice")));
resultMap.put("totalPrice", Long.valueOf(json.getString("totalPrice")));
mav.setModel(BasicModel.buildOKModel().setResult(resultMap));
} else {
mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中..."));
mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!"));
}
} else {
mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!"));
mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中..."));
}
return mav;
}
@@ -69,34 +61,29 @@ public class CommercialController {
if(mav.model()!=null){
return mav;
}
//加上高德获取经纬度 和 根据经纬度估值
Map<String, String> map = GeoUtils.parserByGaode(null, model.getAddress());
if (map != null && map.containsKey("level") && GAODE_LEVEL.contains(map.get("level"))
&& map.containsKey("lng") && map.containsKey("lat")) {
String location = map.get("lng") + "," + map.get("lat");
JSONObject json = locationEvaluateApi(location, String.valueOf(model.getSize()), String.valueOf(model.getEstateType()));
if (json != null) {
if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) {
String msg = json.getString("msg");
BasicModel basicModel = new BasicModel(200, "ok");
if (json.containsKey("case")) {
basicModel.setResult(json.get("case"));
}
mav.setModel(BasicModel.buildOKModel().setResult(basicModel));
JSONObject json = locationEvaluateApi(model.getAddress(), model.getLocation(), String.valueOf(model.getSize()), String.valueOf(model.getEstateType()));
if (json != null) {
if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) {
String msg = json.getString("msg");
BasicModel basicModel = new BasicModel(200, "ok");
if (json.containsKey("case")) {
basicModel.setResult(json.get("case"));
}
} else {
mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中..."));
mav.setModel(BasicModel.buildOKModel().setResult(basicModel));
}
} else {
mav.setModel(BasicModel.buildBadRequestModel("该地址不支持样本输出!"));
mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中..."));
}
return mav;
}
private RestfulModelAndView checkParmas(CommercialModel model, RestfulModelAndView mav){
if (StringUtils.isBlank(model.getAddress()) || model.getSize()==null || model.getEstateType()==null ) {
if (StringUtils.isBlank(model.getAddress()) && StringUtils.isBlank(model.getLocation())) {
mav.setModel(BasicModel.buildBadRequestModel("参数非法:地址或经纬度不为空"));
return mav;
}
if (model.getSize()==null || model.getEstateType()==null ) {
mav.setModel(BasicModel.buildBadRequestModel("参数非法:地址,面积,商铺类型为必填项"));
return mav;
}
@@ -138,12 +125,18 @@ public class CommercialController {
}
private JSONObject locationEvaluateApi(String location, String area, String estateType){
private JSONObject locationEvaluateApi(String address, String location, String area, String estateType){
//商铺类型---0:临街商铺 1:住宅底商 2:购物百货中心 3:写字楼商铺 4:档口摊位 5:市场类商铺 6:交通设施商铺 7:旅游商铺
HttpRequest request = new HttpRequest();
JSONObject json = null;
Map<String, String> params = new HashMap<String, String>();
params.put("location", location);
if(StringUtils.isNotBlank(address)){
params.put("address", address);
}
if(StringUtils.isNotBlank(location)){
params.put("location", location);
}
params.put("area", area);
params.put("estateType", estateType);
try {