diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java index 644c9ec8a..466f872d6 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java @@ -69,6 +69,7 @@ public class DataUtil { private static final String hanziReg = "[\\u4e00-\\u9fa5]"; private static final String englishReg = "[A-Za-z]"; + public static String[] TAGS =new String[]{"独栋", "联排", "叠加", "双拼", "花园面积", "泳池", "别墅", "带花园", "洋房", "叠拼", "独院", "联体", "微墅", "大平墅"}; public static String replaceAll(String original, String with, Pattern... pattern) { if (StringUtils.isNotBlank(original)) { @@ -1841,6 +1842,38 @@ public class DataUtil { return false; } + /** + * 是否是别墅 + * @return + */ + public static boolean isVilla(Double area, String name, Integer height, Integer room) { + if (area == null) { + return false; + } + if (area >= 150 && StringUtils.indexOfAny(name, TAGS) > -1) { + return true; + } + + boolean ret = false; + if (height != null && room != null) { + if (height <= 3) { + if (area > 200 && room >= 5) { + ret = true; + } + } + } else if (height == null && room != null) { + if (area > 360 && room >= 6) { + ret = true; + } + } else if (height == null && room == null) { + if (area > 500) { + ret = true; + } + } + + return ret; + } + diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyServiceImpl.java index d0b7ca0ea..d858c05a2 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyServiceImpl.java @@ -280,10 +280,8 @@ public class AddressMatchProxyServiceImpl extends AbstractHttpApiService impleme params.put("city", city); params.put("address", address); try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure/v2", params, "UTF-8"); - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/v2/structure", params, "UTF-8"); + if (json != null && json.containsKey("msgCode") && json.getInt("msgCode") == 200) { if (json.containsKey("result")) { return (JSONObject) json.get("result"); }