Merge branch 'open_v2' into 'master'

新增接口

See merge request !1174
This commit is contained in:
2025-09-18 18:15:53 +08:00
2 changed files with 78 additions and 5 deletions
@@ -0,0 +1,15 @@
package com.fangjia.core.util;
public class AvmUrls {
/**
* 商铺出售评估及样例房源
*/
public static final String SHOPSELL_EVALUATE = "/avmWeb/shopSell";
/**
* 商铺出租评估及样例房源
*/
public static final String SHOPRENT_EVALUATE = "/avmWeb/shopRent";
}
@@ -1,5 +1,6 @@
package com.fangjia.open.controllers;
import com.fangjia.core.util.AvmUrls;
import com.fangjia.core.util.GeoUtils;
import com.fangjia.core.util.HttpRequest;
import com.fangjia.core.util.HttpRequestException;
@@ -33,7 +34,7 @@ public class CommercialController {
return mav;
}
JSONObject json = locationEvaluateApi(model);
JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPSELL_EVALUATE);
if (json != null) {
if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) {
HashMap<String, Object> resultMap = new HashMap<String, Object>();
@@ -63,7 +64,7 @@ public class CommercialController {
if(mav.model()!=null){
return mav;
}
JSONObject json = locationEvaluateApi(model);
JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPSELL_EVALUATE);
if (json != null) {
if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) {
List<HashMap<String, Object>> list = new ArrayList<HashMap<String, Object>>();
@@ -78,6 +79,63 @@ public class CommercialController {
return mav;
}
public Object shopRentEvaluateAction(CommercialModel model) {
RestfulModelAndView mav = new RestfulModelAndView();
mav.setViewType("rest");
mav = checkParmas(model, mav);
if(mav.model()!=null){
return mav;
}
JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPRENT_EVALUATE);
if (json != null) {
if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) {
HashMap<String, Object> resultMap = new HashMap<String, Object>();
resultMap.put("avgPrice", Long.valueOf(json.getString("unitPrice")));
resultMap.put("totalPrice", Long.valueOf(json.getString("totalPrice")));
if (model.getShowSample()!=null && model.getShowSample()==1 && json.containsKey("case")) {
resultMap.put("samples", json.get("case"));
}
mav.setModel(BasicModel.buildOKModel().setResult(resultMap));
} else {
mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!"));
}
} else {
mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中..."));
}
return mav;
}
public Object shopRentSampleAction(CommercialModel model) {
RestfulModelAndView mav = new RestfulModelAndView();
mav.setViewType("rest");
mav = checkParmas(model, mav);
if(mav.model()!=null){
return mav;
}
JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPRENT_EVALUATE);
if (json != null) {
if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) {
List<HashMap<String, Object>> list = new ArrayList<HashMap<String, Object>>();
if (json.containsKey("case")) {
mav.setModel(BasicModel.buildOKModel().setResult(json.get("case")));
}
}
} else {
mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中..."));
}
return mav;
}
private RestfulModelAndView checkParmas(CommercialModel model, RestfulModelAndView mav){
if (StringUtils.isBlank(model.getAddress()) && StringUtils.isBlank(model.getLocation())) {
mav.setModel(BasicModel.buildBadRequestModel("参数非法:地址或经纬度不为空"));
@@ -125,7 +183,7 @@ public class CommercialController {
}
private JSONObject locationEvaluateApi(CommercialModel model){
private JSONObject locationEvaluateApi(CommercialModel model, String uri){
//商铺类型---0:临街商铺 1:住宅底商 2:购物百货中心 3:写字楼商铺 4:档口摊位 5:市场类商铺 6:交通设施商铺 7:旅游商铺
HttpRequest request = new HttpRequest();
JSONObject json = null;
@@ -140,10 +198,10 @@ public class CommercialController {
params.put("area", String.valueOf(model.getSize()));
params.put("estateType", String.valueOf(model.getEstateType()));
try {
json = request.getJsonContent("http://192.168.0.100:30020/avmWeb/shopSell", params, "UTF-8");
json = request.getJsonContent("http://192.168.0.100:30020"+ uri, params, "UTF-8");
} catch (Exception e) {
try {
json = request.getJsonContent("http://192.168.0.100:30020/avmWeb/shopSell", params, "UTF-8");
json = request.getJsonContent("http://192.168.0.100:30020"+ uri, params, "UTF-8");
} catch (Exception ex) {
ex.printStackTrace();
}