From 1b71354b53f4bdd5d49938d39a6a694cdc03c878 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Fri, 11 Mar 2022 09:37:43 +0800 Subject: [PATCH 01/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E8=A1=A5=E5=85=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/AddressController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index 746bdaa91..2fa5a4b4c 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java @@ -1847,7 +1847,7 @@ public class AddressController { * @param model * @return */ - public Object structureForTestAction(AddesssMatchModel model) { + public Object structureAndCompleteAction(AddesssMatchModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { @@ -1863,10 +1863,10 @@ public class AddressController { // 地址验证无效也输出标准化结果 params.put("flag", "true"); try{ - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureForTest", params, "UTF-8"); + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); } catch(Exception e){ try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureForTest", params, "UTF-8"); + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); } catch(Exception ex){ ex.printStackTrace(); } From a95dde3ce6b67514dfa163397425c5aad70332c5 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Fri, 25 Mar 2022 11:23:35 +0800 Subject: [PATCH 02/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=94=E7=BA=A7?= =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92V2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddressController.java | 45 +++++++++++++++++++ .../src/main/resources/urlrewrite2.0.xml | 5 +++ 2 files changed, 50 insertions(+) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index 2fa5a4b4c..af890d880 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java @@ -1797,6 +1797,51 @@ public class AddressController { return mav; } + /** + * 五级行政区划V2地址标准化接口 + * + * @param model + * @return + */ + public Object fiveDivisionStructure2Action(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 params = new HashMap(); + 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/v2", params, "UTF-8"); + } catch(Exception e){ + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure/v2", 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; + } + /** * 详细地址标准化接口 * diff --git a/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml b/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml index ba0a21b49..c17530d88 100644 --- a/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml +++ b/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml @@ -38,5 +38,10 @@ /address/standard + + + /address/fiveDivisionStructure + + \ No newline at end of file From 05c6b5b0e9acc9f3f13d7c60d7ac190be1743541 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Wed, 30 Mar 2022 16:39:46 +0800 Subject: [PATCH 03/42] =?UTF-8?q?=E9=94=80=E5=94=AE=E7=BA=BF=E7=B4=A2?= =?UTF-8?q?=E4=B9=B1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/core/util/DataUtil.java | 10 ++++++ .../controllers/SaleLeadsController.java | 32 ++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) 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 93218b265..c51c573f7 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 @@ -1805,6 +1805,16 @@ public class DataUtil { } } + public static boolean isChineseChar(String c) { + if (StringUtils.isNotBlank(c)) { + String temp = String.valueOf(c); + Pattern pattern = Pattern.compile("[\\u4e00-\\u9fa5]+"); + Matcher matcher = pattern.matcher(temp); + return matcher.matches(); + } + return false; + } + public static void main(String[] args) { System.out.println(getFirstChar("文裕花园")); System.out.println(getFirstChar("文怡花园")); diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java index 3f6881dd5..f8c75d856 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java @@ -1,5 +1,9 @@ package com.fangjia.coresite.controllers; +import java.io.UnsupportedEncodingException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.net.URLEncoder; import java.util.Date; import java.util.List; @@ -7,6 +11,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.fangjia.core.util.DataUtil; import org.apache.commons.lang.StringUtils; import com.fangjia.coresite.model.JsonModel; @@ -37,7 +42,7 @@ public class SaleLeadsController { } public Object doAddAction(SaleLeadsModel model, HttpServletRequest req, - HttpServletResponse res) { + HttpServletResponse res) throws UnsupportedEncodingException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { model.setViewType("redirect"); String refUrl = model.getBackUrl(); @@ -122,6 +127,8 @@ public class SaleLeadsController { } } + + saleLeads = converValue(saleLeads); saleLeadsService.save(saleLeads); if(StringUtils.isNotBlank(saleLeads.getBusiness()) && saleLeads.getBusiness().contains("_")){ @@ -162,6 +169,29 @@ public class SaleLeadsController { model.setViewParam("location", url); return model; } + + private SaleLeads converValue(SaleLeads saleLeads) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, UnsupportedEncodingException { +// + Field[] fields = saleLeads.getClass().getDeclaredFields(); + for(Field s : fields){ + String name = s.getName(); + String type = s.getGenericType().toString(); + if(type.contains("java.lang.String")){ + String fildName = name.substring(0,1).toUpperCase()+name.substring(1); + Method m = saleLeads.getClass().getMethod("get"+fildName); + String value = (String)m.invoke(saleLeads); + if(StringUtils.isNotBlank(value)){ + if(!DataUtil.isChineseChar(value)){ + String newValue = new String(value.getBytes("ISO8859-1"), "UTF-8"); + m = saleLeads.getClass().getMethod("set"+fildName,String.class); + m.invoke(saleLeads, newValue); + } + } + } + } + return saleLeads; + + } public Object addDownInfoAction(SaleLeadsModel model, HttpServletRequest req, From 14c58bdba9504180956cc218c084a3f155906331 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Wed, 30 Mar 2022 19:21:22 +0800 Subject: [PATCH 04/42] update --- .../java/com/fangjia/core/util/DataUtil.java | 16 +++++++++++----- .../controllers/SaleLeadsController.java | 5 +++-- 2 files changed, 14 insertions(+), 7 deletions(-) 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 bec6487c4..d4cc2d5da 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 @@ -25,6 +25,7 @@ import java.util.zip.GZIPOutputStream; import com.hankcs.hanlp.HanLP; import com.hankcs.hanlp.dictionary.py.Pinyin; +import com.sun.javafx.scene.transform.TransformUtils; import net.sf.json.JSON; import net.sf.json.JSONArray; import net.sf.json.JSONNull; @@ -1827,18 +1828,23 @@ public class DataUtil { public static boolean isChineseChar(String c) { if (StringUtils.isNotBlank(c)) { String temp = String.valueOf(c); - Pattern pattern = Pattern.compile("[\\u4e00-\\u9fa5]+"); + Pattern pattern = Pattern.compile("[\\u4e00-\\u9fa5\\w]+"); Matcher matcher = pattern.matcher(temp); return matcher.matches(); } return false; } - public static void main(String[] args) { - System.out.println(getFirstChar("文裕花园")); - System.out.println(getFirstChar("文怡花园")); - System.out.println(FourUpSixInto("258.393", 2)); + + + + + public static void main(String[] args) { + System.out.println(isChineseChar("6文怡a花园")); +// System.out.println(getFirstChar("文怡花园")); +// +// System.out.println(FourUpSixInto("258.393", 2)); } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java index f8c75d856..9596069f4 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java @@ -181,8 +181,9 @@ public class SaleLeadsController { Method m = saleLeads.getClass().getMethod("get"+fildName); String value = (String)m.invoke(saleLeads); if(StringUtils.isNotBlank(value)){ - if(!DataUtil.isChineseChar(value)){ - String newValue = new String(value.getBytes("ISO8859-1"), "UTF-8"); + String s1 = value.replaceAll("\\pP|\\pS", ""); + if(!DataUtil.isChineseChar(s1)){ + String newValue = new String(value.getBytes("ISO8859-1"), "UTF-8"); m = saleLeads.getClass().getMethod("set"+fildName,String.class); m.invoke(saleLeads, newValue); } From 3a5e73267e61bf9d14d3e03784e7756af3808bfe Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Mon, 4 Apr 2022 14:46:55 +0800 Subject: [PATCH 05/42] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=B9=E9=85=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/service/address/mode/Address.java | 1 + .../service/address/processor/KeywordProcessor.java | 4 ++-- .../address/processor/StageAndPartitionProcessor.java | 10 ++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java index 1c8f2d004..720da51bb 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java @@ -397,6 +397,7 @@ public class Address { } public void setOrgAddress(String orgAddress) { + orgAddress = orgAddress.toUpperCase(); setAddress(orgAddress); if(this.orgAddress != null){ throw new UnsupportedOperationException("原始地址不能被修改"); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java index 547d8d2cb..24ff62e1f 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java @@ -70,9 +70,9 @@ public class KeywordProcessor extends AbstractAddressProcessor { if(StringUtils.isNotBlank(address.getAddress())){ if(address.getOrgAddress().indexOf(sb.toString()) >= address.getOrgAddress().indexOf(address.getAddress())){ - sb.insert(0, address.getAddress()); - }else{ sb.append(address.getAddress()); + }else{ + sb.insert(0, address.getAddress()); } String kw = fetchKeywords(address.getAddress()); if(StringUtils.isNotBlank(kw)){ diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/StageAndPartitionProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/StageAndPartitionProcessor.java index ab5c929b3..7e4be0d63 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/StageAndPartitionProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/StageAndPartitionProcessor.java @@ -23,11 +23,17 @@ public class StageAndPartitionProcessor extends AbstractAddressProcessor { addr = addr.replaceAll(matchResult.matchContent, formatStage); address.setAddress(addr); } - address.setStage(matchResult.matchContent); + address.setStage(formatStage); } matchResult = matchFirst(AddressParserPatterns.PARTITION_PATTERN, orgAddr); if (matchResult != null) { - address.setPartition(matchResult.matchContent); + String formatPartition = CNNMFilter.convertArabicToCnNumeric(matchResult.matchContent); + if(!formatPartition.equals(matchResult.matchContent)){ + String addr = address.getAddress(); + addr = addr.replaceAll(matchResult.matchContent, formatPartition); + address.setAddress(addr); + } + address.setStage(formatPartition); } return RepeatStatus.NEXT; } From 16798c7d2040d8fe4eb9078a67f86004d00e70db Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Mon, 4 Apr 2022 15:08:34 +0800 Subject: [PATCH 06/42] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=B9=E9=85=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/service/address/processor/KeywordProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java index 24ff62e1f..547d8d2cb 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java @@ -70,9 +70,9 @@ public class KeywordProcessor extends AbstractAddressProcessor { if(StringUtils.isNotBlank(address.getAddress())){ if(address.getOrgAddress().indexOf(sb.toString()) >= address.getOrgAddress().indexOf(address.getAddress())){ - sb.append(address.getAddress()); - }else{ sb.insert(0, address.getAddress()); + }else{ + sb.append(address.getAddress()); } String kw = fetchKeywords(address.getAddress()); if(StringUtils.isNotBlank(kw)){ From 9a4e807e3cd0168cd0546a96bdc474ba68b3a101 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Tue, 19 Apr 2022 13:46:20 +0800 Subject: [PATCH 07/42] =?UTF-8?q?=E6=94=BE=E5=BC=80=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B4=A6=E5=8F=B7=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/open/controllers/PropertyController.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index f6e9855f0..eb9325a57 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -665,18 +665,6 @@ public class PropertyController { return mav; } String userId = FangjiaApiUtil.parseUserId(model.getToken()); - - /**超级用户和上海交大账户不控制权限*/ - if (!"1007497".equals(userId) && !"1007632".equals(userId) && !"1007548".equals(userId) - && !"1007486".equals(userId) && !"1007533".equals(userId) && !"1007630".equals(userId) - && !"1007705".equals(userId) && !"1007739".equals(userId) && !"1007736".equals(userId) - && !"1007741".equals(userId) && !"1007742".equals(userId) && !"1007743".equals(userId) - && !"1007747".equals(userId) && !"1007757".equals(userId) - && model.getDetailLevel() != null && model.getDetailLevel() != 0) {// 临时权限控制 - mav.setModel(BasicModel.buildUnAuthorizedModel()); - return mav; - } - District district = null; if (StringUtils.isNotBlank(model.getId())){ if(ObjectId.isValid(model.getId())){ From 3e2f58f80d0cf4f5559579dee5003ac4d549e7f4 Mon Sep 17 00:00:00 2001 From: xuhe Date: Sat, 7 May 2022 19:14:40 +0800 Subject: [PATCH 08/42] =?UTF-8?q?=E4=BC=B0=E5=80=BC=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=80=BB=E6=A5=BC=E5=B1=82=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mongo/model/bkoff/Loudong.java | 15 ++++++++++++++- .../open/controllers/PropertyController.java | 6 ++++++ .../service/mongo/bkoff/LoudongService.java | 2 ++ .../mongo/bkoff/LoudongServiceImpl.java | 19 +++++++++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java index 712b5fc7d..12cb8ca9b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java @@ -101,7 +101,11 @@ public class Loudong implements MongoEntity { * seaweed中的小区名 */ private String nameInSeaweed; - + /** + * seaweed中的小区id + */ + private String idInSeaweed; + @Column(name = "remark") public String getRemark() { return remark; @@ -402,4 +406,13 @@ public class Loudong implements MongoEntity { public void setNameInSeaweed(String nameInSeaweed) { this.nameInSeaweed = nameInSeaweed; } + + @Column(name = "id_in_seaweed") + public String getIdInSeaweed() { + return idInSeaweed; + } + + public void setIdInSeaweed(String idInSeaweed) { + this.idInSeaweed = idInSeaweed; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index eb9325a57..db58913eb 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -948,6 +948,12 @@ public class PropertyController { return mav; } + if(model.getMaxFloor() == null && model.getFloor() != null &&StringUtils.isNotBlank(model.getBuildingNumber())){ + Loudong loudong = loudongService.findForEvaluate(district.getId(), model.getBuildingNumber(), model.getUnitNumber()); + if(loudong != null && loudong.getFloors() >= model.getFloor()){ + model.setMaxFloor(loudong.getFloors()); + } + } model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); if (StringUtils.isBlank(model.getPropertyType())) { diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongService.java index a38fdab95..087123cbb 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongService.java @@ -41,4 +41,6 @@ public interface LoudongService { void save(Map data); List findAllSources(); + + Loudong findForEvaluate(String idInSeaweed, String houseNumber, String unitNumber); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongServiceImpl.java index 57e9c6bad..1efc1c617 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongServiceImpl.java @@ -318,4 +318,23 @@ public class LoudongServiceImpl implements LoudongService { } return froms; } + + @Override + public Loudong findForEvaluate(String idInSeaweed, String houseNumber, String unitNumber){ + if(StringUtils.isBlank(idInSeaweed) || StringUtils.isBlank(houseNumber)){ + return null; + } + List params = Lists.newArrayList(); + params.add(new QueryParam("idInSeaweed", idInSeaweed)); + params.add(new QueryParam("houseNumber", houseNumber)); + if(StringUtils.isNotBlank(unitNumber)) { + params.add(new QueryParam("unitNumber", unitNumber)); + } + params.add(new QueryParam("floors", QueryParam.GREATER_THAN_OPERATOR, 0)); + params.add(new QueryParam("floors", QueryParam.LESS_THAN_OPERATOR, 60)); + params.add(new QueryParam("status", QueryParam.NOT_EQUAL_OPERATOR, 0)); + + List sortParams = ImmutableList.of(new SortParam("floors", false)); + return loudongDao.findFirstByParams(params, sortParams); + } } From c066c22dc34c359dd8884039eeecd0ef0f6654dc Mon Sep 17 00:00:00 2001 From: xuhe Date: Sun, 8 May 2022 16:23:17 +0800 Subject: [PATCH 09/42] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E7=9A=84ip=E5=92=8Cheader=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/requestController.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 projects/fangjia-open/src/main/java/com/fangjia/open/controllers/requestController.java diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/requestController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/requestController.java new file mode 100644 index 000000000..d23a312bb --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/requestController.java @@ -0,0 +1,36 @@ +package com.fangjia.open.controllers; + +import com.fangjia.core.util.AnalyticsUtil; +import com.fangjia.open.interceptors.Authority; +import com.fangjia.open.interceptors.Role; +import com.fangjia.open.model.BasicModel; +import com.fangjia.open.model.RestfulModelAndView; + +import javax.servlet.http.HttpServletRequest; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; + +public class requestController { + + /** + * 获取请求的request和IP信息 + * @param request + * @return + */ + public Object requestAction(HttpServletRequest request) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + String ip = AnalyticsUtil.getIpAddress(request); + Map map = new HashMap(); + Enumeration headerNames = request.getHeaderNames(); + while (headerNames.hasMoreElements()) { + String key = (String) headerNames.nextElement(); + String value = request.getHeader(key); + map.put(key, value); + } + map.put("ip", ip); + mav.setModel(BasicModel.buildOKModel().setResult(map)); + return mav; + } +} From 2a70fb989cea97eb0d6285e52d0b95802aa18179 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Wed, 11 May 2022 13:31:49 +0800 Subject: [PATCH 10/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mongo/model/DistrictFacilitys.java | 9 ++++ .../dal/mongo/model/bkoff/HouseLoudong.java | 1 + .../dal/mongo/model/bkoff/Loudong.java | 13 +++++ .../open/controllers/DistrictController.java | 53 +++++++++++++------ .../open/controllers/PropertyController.java | 35 +++++++++++- .../com/fangjia/open/dto/DistrictInfoDto.java | 9 ++++ .../open/model/PropertyEvaluationModel.java | 21 ++++++++ .../mongo/bkoff/HouseLoudongService.java | 2 + .../mongo/bkoff/HouseLoudongServiceImpl.java | 16 ++++++ .../service/mongo/bkoff/LoudongService.java | 2 + .../mongo/bkoff/LoudongServiceImpl.java | 17 ++++++ 11 files changed, 160 insertions(+), 18 deletions(-) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictFacilitys.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictFacilitys.java index 36021519c..cc946257b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictFacilitys.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictFacilitys.java @@ -63,6 +63,7 @@ public class DistrictFacilitys implements MongoEntity { private String imgUrl3D; private List school; + private List keySchool; @Id @GeneratedValue @@ -380,4 +381,12 @@ public class DistrictFacilitys implements MongoEntity { this.school = school; } + @Column(name = "key_school") + public List getKeySchool() { + return keySchool; + } + + public void setKeySchool(List keySchool) { + this.keySchool = keySchool; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseLoudong.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseLoudong.java index cf98a3665..d41b400ee 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseLoudong.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/HouseLoudong.java @@ -448,6 +448,7 @@ public class HouseLoudong extends com.fangjia.dal.mongo.model.HouseLoudong{ this.openTotalPrice = openTotalPrice; } + @Column(name = "district_id") public String getDistrictId() { return districtId; } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java index 712b5fc7d..ef04d1c45 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java @@ -101,6 +101,10 @@ public class Loudong implements MongoEntity { * seaweed中的小区名 */ private String nameInSeaweed; + /** + * 小区编号 + */ + private String idInSeaweed; @Column(name = "remark") public String getRemark() { @@ -402,4 +406,13 @@ public class Loudong implements MongoEntity { public void setNameInSeaweed(String nameInSeaweed) { this.nameInSeaweed = nameInSeaweed; } + + @Column(name = "id_in_seaweed") + public String getIdInSeaweed() { + return idInSeaweed; + } + + public void setIdInSeaweed(String idInSeaweed) { + this.idInSeaweed = idInSeaweed; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictController.java index 859a04ef0..395cb8a8d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictController.java @@ -7,11 +7,11 @@ import javax.servlet.http.HttpServletRequest; import com.fangjia.core.RegionData; import com.fangjia.core.util.DateUtil; -import com.fangjia.dal.mongo.model.RegionStat; -import com.fangjia.dal.mongo.model.RegionStatRent; +import com.fangjia.dal.mongo.model.*; import com.fangjia.open.model.AvgPriceQueryModel; import com.fangjia.open.model.BasicModel; import com.fangjia.service.datastore.RegionStatService; +import com.fangjia.service.district.DistrictFacilitysService; import com.fangjia.service.district.DistrictStatRentService; import com.fangjia.service.district.RegionStatRentService; import com.fangjia.service.mongo.fangjia.AverageAnalyService; @@ -38,8 +38,6 @@ import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.common.FangjiaServerAreaContextHolder; import com.fangjia.dal.common.ServerAreaData; import com.fangjia.dal.mongo.fangjia.model.ServerArea; -import com.fangjia.dal.mongo.model.DistrictHouse; -import com.fangjia.dal.mongo.model.DistrictStat; import com.fangjia.dal.mongo.model.bkoff.ExtractDistrict; import com.fangjia.dal.seaweed.model.District; import com.fangjia.dal.sql.model.ApiUser; @@ -93,6 +91,7 @@ public class DistrictController { private RegionBlockService regionBlockService; private RegionStatService regionStatService; private RegionStatRentService regionStatRentService; + private DistrictFacilitysService districtFacilitysService; public static final String[] COLUMNS = { "id", "name", "estateType", "buildType", "licence", "buildArea", "allArea", @@ -444,19 +443,19 @@ public class DistrictController { * * @return */ - public Object showAction(DistrictSearchModel model, @Param(name = "city") String city, @Param(name = "region") String region, - @Param(name = "name") String name, HttpServletRequest request) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isBlank(name) || StringUtils.isBlank(city) || StringUtils.isBlank(region)) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市,小区名,所在区域必必须输入")); - return mav; - } else { - DistrictBo districtBo = districtService.findByFullMode(new DistrictKey(city, region, name)); - if (null == districtBo) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区数据不存在,请检查查询条件")); + public Object showAction(DistrictSearchModel model, @Param(name = "city") String city, @Param(name = "region") String region, + @Param(name = "name") String name, HttpServletRequest request) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isBlank(name) || StringUtils.isBlank(city) || StringUtils.isBlank(region)) { + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市,小区名,所在区域必必须输入")); return mav; - } + } else { + DistrictBo districtBo = districtService.findByFullMode(new DistrictKey(city, region, name)); + if (null == districtBo) { + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区数据不存在,请检查查询条件")); + return mav; + } districtBo.setStat(this.districtStatService.findDistrictStat(districtBo.getDistrictKey())); // 去除小区描述中的html标签 districtBo.setDescription(DataUtil.removeSpecialString(districtBo.getDescription())); @@ -1146,6 +1145,25 @@ public class DistrictController { ret.put("RESULT", 200); return mav; } + + public Object facilitysAction(DistrictSearchModel model, @Param(name = "city") String city, @Param(name = "region") String region, + @Param(name = "name") String name, HttpServletRequest request) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isBlank(name) || StringUtils.isBlank(city) || StringUtils.isBlank(region)) { + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区所在城市,小区名,所在区域必必须输入")); + return mav; + } else { + District districtBo = districtService.findDistrict(new DistrictKey(city, region, name), "district"); + if (null == districtBo) { + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区数据不存在")); + return mav; + } + DistrictFacilitys facilitys = districtFacilitysService.findByDistrict(districtBo); + mav.setModel(BasicModel.buildOKModel().setResult(facilitys)); + } + return mav; + } @@ -1230,4 +1248,7 @@ public class DistrictController { this.regionStatRentService = regionStatRentService; } + public void setDistrictFacilitysService(DistrictFacilitysService districtFacilitysService) { + this.districtFacilitysService = districtFacilitysService; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index f6e9855f0..29b964d55 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -740,7 +740,7 @@ public class PropertyController { } else { districtInfoDto.setBuildingType(""); } - districtInfoDto.setAlias(district.getAlias()); + districtInfoDto.setAlias(district.getMappingAlias()); districtInfoDto.setAddressAlias(district.getAddrAlias()); districtInfoDto.setCommunity(district.getStreetCommunity()); districtInfoDto.setCommercialArea(district.getBusinessQuarter()); @@ -792,6 +792,7 @@ public class PropertyController { districtInfoDto.setDescription(district.getDescription()); districtInfoDto.setSalesOfficeAdd(district.getSellAddress()); districtInfoDto.setSalesPhoneNumber(district.getMobile()); + districtInfoDto.setTownship(district.getTownship()); if (district.getLoudongCount() != null && district.getLoudongCount() > 0) { districtInfoDto.setBuildingCount(district.getLoudongCount()); } @@ -1116,7 +1117,7 @@ public class PropertyController { model.setCalDate(calDate); } /* 先到CPDB库中查找小区 */ - District district = matchDistrict(model.getCity(), model.getAddress(), model.getDistrict(), model.getName()); + District district = districtService.findDistrict(new DistrictKey(model.getCity(), model.getDistrict(), model.getName()), "district");//matchDistrict(model.getCity(), model.getAddress(), model.getDistrict(), model.getName()); if(district == null){ //防止地址模糊,名称详细的情况 district = matchDistrict(model.getCity(), model.getName(), model.getDistrict(), model.getAddress()); @@ -5412,6 +5413,36 @@ public class PropertyController { } } + public Object searchHouseLoudongAction(PropertyEvaluationModel model, HttpServletRequest request)throws NumberFormatException, IllegalAccessException { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (StringUtils.isBlank(model.getId()) || StringUtils.isBlank(model.getHouseNumber()) || StringUtils.isBlank(model.getRoomNumber())){ + mav.setModel(BasicModel.buildBadRequestModel("参数非法:楼盘编号,楼栋号,室为必填项")); + return mav; + } + + List houseLoudongs = houseLoudongService.findAll(model.getId(), model.getHouseNumber(), model.getUnitNumber(), model.getRoomNumber()); + mav.setModel(BasicModel.buildOKModel().setResult(houseLoudongs)); + return mav; + } + + + public Object searchLoudongAction(PropertyEvaluationModel model, HttpServletRequest request)throws NumberFormatException, IllegalAccessException { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (StringUtils.isBlank(model.getId()) || StringUtils.isBlank(model.getHouseNumber())){ + mav.setModel(BasicModel.buildBadRequestModel("参数非法:楼盘编号,楼栋号为必填项")); + return mav; + } + + + List loudongs = loudongService.findAll(model.getId(), model.getHouseNumber(), model.getUnitNumber()); + mav.setModel(BasicModel.buildOKModel().setResult(loudongs)); + return mav; + } + public void setHouseLoudongService(HouseLoudongService houseLoudongService) { this.houseLoudongService = houseLoudongService; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java index 1ab67359e..d938d3a8b 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java @@ -99,6 +99,7 @@ public class DistrictInfoDto { private String salesPhoneNumber; private Integer buildingCount; private Integer finishYear; + private String township; public String getDistrict() { @@ -818,4 +819,12 @@ public class DistrictInfoDto { public void setFinishYear(Integer finishYear) { this.finishYear = finishYear; } + + public String getTownship() { + return township; + } + + public void setTownship(String township) { + this.township = township; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java index 5953fc3a3..859658742 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java @@ -46,7 +46,12 @@ public class PropertyEvaluationModel extends FangjiaApiModel { * 楼号 */ private String unitNumber; + /** + * 新楼号 + */ + private String houseNumber; + private String id; /** * 室号 */ @@ -905,4 +910,20 @@ public class PropertyEvaluationModel extends FangjiaApiModel { public void setAvgPrice(Integer avgPrice) { this.avgPrice = avgPrice; } + + public String getHouseNumber() { + return houseNumber; + } + + public void setHouseNumber(String houseNumber) { + this.houseNumber = houseNumber; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/HouseLoudongService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/HouseLoudongService.java index 3f6ad7f39..236cf00c0 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/HouseLoudongService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/HouseLoudongService.java @@ -94,4 +94,6 @@ public interface HouseLoudongService { public List findAll(List queryParams, Pager pager); List findAllSources(); + + public List findAll(String id, String houseNum, String unitNum, String roomNum); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/HouseLoudongServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/HouseLoudongServiceImpl.java index 70286758b..9fe6af3ef 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/HouseLoudongServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/HouseLoudongServiceImpl.java @@ -297,6 +297,22 @@ public class HouseLoudongServiceImpl implements HouseLoudongService { return froms; } + @Override + public List findAll(String id, String houseNum, String unitNum, String roomNum) { + List params = new ArrayList(); + params.add(new QueryParam("districtId", id)); + if (StringUtils.isNotBlank(houseNum)) { + params.add(new QueryParam("houseNum", houseNum)); + } + if (StringUtils.isNotBlank(unitNum)) { + params.add(new QueryParam("houseNumUnit", unitNum)); + } + if (StringUtils.isNotBlank(roomNum)) { + params.add(new QueryParam("roomNum", roomNum)); + } + return houseLoudongBkoffDao.findAllByParams(params); + } + @Override public List queryHouseLoudongList(String city, String districtName, String roomNum, Pager pager) { List params = new ArrayList(); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongService.java index a38fdab95..682b2aaca 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongService.java @@ -23,6 +23,8 @@ public interface LoudongService { List findAll(String city, String region, String name, String houseNumber, String unitNumber, int limit); + List findAll(String id, String houseNumber, String unitNumber); + Map findAll(List query, String city); Loudong findById(String id); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongServiceImpl.java index 57e9c6bad..05e2f9f3e 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/LoudongServiceImpl.java @@ -148,6 +148,23 @@ public class LoudongServiceImpl implements LoudongService { return loudongDao.findAllByParams(params,null, 0 , limit, ADDRESS_VERIFY_FIELDS); } + @Override + public List findAll(String id, String houseNumber, String unitNumber) { + List params = new ArrayList(); + if(StringUtils.isNotBlank(id)) { + params.add(new QueryParam("idInSeaweed", id)); + } + + if(StringUtils.isNotBlank(houseNumber)) { + params.add(new QueryParam("houseNumber", houseNumber)); + } + if(StringUtils.isNotBlank(unitNumber)) { + params.add(new QueryParam("unitNumber", unitNumber)); + } + + return loudongDao.findAllByParams(params); + } + @Override public Loudong findById(String id) { return loudongDao.findById(id); From 816616484f61be639ccf7c20c8d993f4d8717b20 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 12 May 2022 00:11:57 +0800 Subject: [PATCH 11/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mongo/dao/BsEvaluationDao.java | 7 + .../dal/mongo/dao/BsEvaluationDaoImpl.java | 8 + .../fangjia/dal/mongo/model/BsEvaluation.java | 184 ++++++++++++++++++ .../dal/mongo/model/bkoff/DealPrice.java | 41 ++++ .../dal/seawater/dao/SeawaterDaoImpl.java | 7 + .../fangjia/dal/seawater/model/Seawater.java | 20 ++ .../open/controllers/AuctionController.java | 25 ++- .../open/controllers/DealPriceController.java | 38 ++++ .../controllers/EvaluationController.java | 62 +++++- .../open/controllers/HouseController.java | 58 ++++++ .../open/controllers/PropertyController.java | 1 + .../com/fangjia/open/model/AuctionModel.java | 9 + .../fangjia/open/model/DealPriceModel.java | 39 ++++ .../fangjia/open/model/EvaluationModel.java | 36 ++++ .../fangjia/open/model/HouseSearchModel.java | 12 +- .../com/fangjia/open/model/SearchModel.java | 18 ++ .../datastore/BsEvaluationService.java | 11 ++ .../datastore/BsEvaluationServiceImpl.java | 44 +++++ .../mongo/fangjia/DealPriceService.java | 2 + .../mongo/fangjia/DealPriceServiceImpl.java | 23 +++ 20 files changed, 635 insertions(+), 10 deletions(-) create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/BsEvaluationDao.java create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/BsEvaluationDaoImpl.java create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BsEvaluation.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/datastore/BsEvaluationService.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/datastore/BsEvaluationServiceImpl.java diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/BsEvaluationDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/BsEvaluationDao.java new file mode 100644 index 000000000..5f895886b --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/BsEvaluationDao.java @@ -0,0 +1,7 @@ +package com.fangjia.dal.mongo.dao; + +import com.fangjia.dal.MongoDao; +import com.fangjia.dal.mongo.model.BsEvaluation; + +public interface BsEvaluationDao extends MongoDao { +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/BsEvaluationDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/BsEvaluationDaoImpl.java new file mode 100644 index 000000000..e4d7fc080 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/BsEvaluationDaoImpl.java @@ -0,0 +1,8 @@ +package com.fangjia.dal.mongo.dao; + +import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.mongo.model.BsEvaluation; + +public class BsEvaluationDaoImpl extends MongoDaoImpl implements + BsEvaluationDao { +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BsEvaluation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BsEvaluation.java new file mode 100644 index 000000000..d3b1b28f0 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/BsEvaluation.java @@ -0,0 +1,184 @@ +package com.fangjia.dal.mongo.model; + +import com.fangjia.dal.MongoEntity; + +import javax.persistence.*; +import java.util.Date; + +@Entity +@Table(name = "business.evaluation") +public class BsEvaluation implements MongoEntity { + private String id; + private String fullAddress; + private String commid; + private String cityName; + private String distName; + private String commName; + private String address; + private Double buildArea; + private Integer floor; + private Integer floorcnt; + private Integer roomcnt; + private Integer livingroomcnt; + private String houseaspect;//南 + private String fitment; + private Date cDate; + private Integer unitPrice; + private Integer totalPrice; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "_id") + public String getId() { + return id; + } + + @Override + public void setId(String id) { + this.id = id; + } + + @Column(name = "full_address") + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + @Column(name = "commid") + public String getCommid() { + return commid; + } + + public void setCommid(String commid) { + this.commid = commid; + } + + @Column(name = "cityname") + public String getCityName() { + return cityName; + } + + public void setCityName(String cityName) { + this.cityName = cityName; + } + + @Column(name = "distname") + public String getDistName() { + return distName; + } + + public void setDistName(String distName) { + this.distName = distName; + } + + @Column(name = "commname") + public String getCommName() { + return commName; + } + + public void setCommName(String commName) { + this.commName = commName; + } + + @Column(name = "address") + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + @Column(name = "buildarea") + public Double getBuildArea() { + return buildArea; + } + + public void setBuildArea(Double buildArea) { + this.buildArea = buildArea; + } + + @Column(name = "floor") + public Integer getFloor() { + return floor; + } + + public void setFloor(Integer floor) { + this.floor = floor; + } + + @Column(name = "floorcnt") + public Integer getFloorcnt() { + return floorcnt; + } + + public void setFloorcnt(Integer floorcnt) { + this.floorcnt = floorcnt; + } + + @Column(name = "roomcnt") + public Integer getRoomcnt() { + return roomcnt; + } + + public void setRoomcnt(Integer roomcnt) { + this.roomcnt = roomcnt; + } + + @Column(name = "livingroomcnt") + public Integer getLivingroomcnt() { + return livingroomcnt; + } + + public void setLivingroomcnt(Integer livingroomcnt) { + this.livingroomcnt = livingroomcnt; + } + + @Column(name = "houseaspect") + public String getHouseaspect() { + return houseaspect; + } + + public void setHouseaspect(String houseaspect) { + this.houseaspect = houseaspect; + } + + @Column(name = "fitment") + public String getFitment() { + return fitment; + } + + public void setFitment(String fitment) { + this.fitment = fitment; + } + + @Column(name = "c_date") + public Date getcDate() { + return cDate; + } + + public void setcDate(Date cDate) { + this.cDate = cDate; + } + + @Column(name = "unitprice") + public Integer getUnitPrice() { + return unitPrice; + } + + public void setUnitPrice(Integer unitPrice) { + this.unitPrice = unitPrice; + } + + @Column(name = "totalprice") + public Integer getTotalPrice() { + return totalPrice; + } + + public void setTotalPrice(Integer totalPrice) { + this.totalPrice = totalPrice; + } +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealPrice.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealPrice.java index a4ababe8e..a46cd7de0 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealPrice.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealPrice.java @@ -48,6 +48,11 @@ public class DealPrice implements MongoEntity { private Integer floor;//当前楼层 private Long score; + private String matchId; + private String matchCity; + private String matchRegion; + private String matchName; + @Id @GeneratedValue @Column(name = "_id", unique = true, nullable = false) @@ -296,4 +301,40 @@ public class DealPrice implements MongoEntity { } return true; } + + @Column(name = "match_id") + public String getMatchId() { + return matchId; + } + + public void setMatchId(String matchId) { + this.matchId = matchId; + } + + @Column(name = "match_city") + public String getMatchCity() { + return matchCity; + } + + public void setMatchCity(String matchCity) { + this.matchCity = matchCity; + } + + @Column(name = "match_region") + public String getMatchRegion() { + return matchRegion; + } + + public void setMatchRegion(String matchRegion) { + this.matchRegion = matchRegion; + } + + @Column(name = "match_name") + public String getMatchName() { + return matchName; + } + + public void setMatchName(String matchName) { + this.matchName = matchName; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java index e71226a4a..203b6818b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java @@ -67,6 +67,13 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i must.add(addTerms("district_name", alias)); must.add(addMatch("cat", "sell")); must.add(addRange("avg_price", minPrice, maxPrice)); + + JSONObject term = new JSONObject(); + JSONObject match = new JSONObject(); + match.put("p_date", 20210501); + term.put("match", match); + must.add(term); + bool.put("must", must); query.put("bool", bool); reqBody.put("query", query); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java index c761ba76a..48005c87b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java @@ -58,6 +58,8 @@ public class Seawater implements SeawaterEntity { private String url; private String root; private Integer avgPrice; + private String purpose; + private String estateType; @Id @Column(name = "_id") @@ -285,4 +287,22 @@ public class Seawater implements SeawaterEntity { public void setAvgPrice(Integer avgPrice) { this.avgPrice = avgPrice; } + + @Column(name = "purpose") + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + @Column(name = "estate_type") + public String getEstateType() { + return estateType; + } + + public void setEstateType(String estateType) { + this.estateType = estateType; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java index 13e59faa4..ed4a73f2d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java @@ -23,13 +23,13 @@ import java.util.regex.Pattern; /** * 法拍数据提供接口 */ -@Authority(role = Role.USER) +//@Authority(role = Role.USER) public class AuctionController { private PaiMaiService paiMaiService; private DistrictNewPriceService districtNewPriceService; - private static final String[] SEARCH_FIELDS = new String[]{"marketAvgPrice", "startDate", "curPrice", "imgUrls", "id", "matchCity", "matchRegion", "matchName", "address", "marketTotalPrice", "startPrice", "curPrice", "predictPrice", "depositPrice", "area", "status", "url", "matchEstateType"}; + private static final String[] SEARCH_FIELDS = new String[]{"marketAvgPrice", "startDate", "curPrice", "imgUrls", "id", "matchCity", "matchRegion", "matchName", "address", "marketTotalPrice", "startPrice", "curPrice", "predictPrice", "depositPrice", "area", "status", "url", "matchEstateType","type","count"}; public Object housesAction(AuctionModel model){ RestfulModelAndView mav = new RestfulModelAndView(); @@ -187,6 +187,27 @@ public class AuctionController { return mav; } + + public Object searchPaimaisAction(AuctionModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + List params = new ArrayList(); + if(StringUtils.isNotBlank(model.getCity())){ + params.add(new QueryParam("matchCity", model.getCity())); + } + if(StringUtils.isNotBlank(model.getDistrict())){ + params.add(new QueryParam("matchRegion", model.getDistrict())); + } + + if(StringUtils.isNotBlank(model.getName())){ + params.add(new QueryParam("matchName", model.getName())); + } + List sortParams = new ArrayList(); + sortParams.add(new SortParam("startDate", false)); + List paimais = paiMaiService.findAll(params, sortParams, model.getLimit(), SEARCH_FIELDS); + mav.setModel(BasicModel.buildOKModel().setResult(paimais)); + return mav; + } + public void setPaiMaiService(PaiMaiService paiMaiService) { this.paiMaiService = paiMaiService; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DealPriceController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DealPriceController.java index 8abece9e2..ab916308a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DealPriceController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DealPriceController.java @@ -15,8 +15,10 @@ import java.util.Map.Entry; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.mongo.model.Metro; import com.fangjia.open.model.BasicModel; +import com.fangjia.service.bo.DistrictStatBo; import org.apache.commons.lang.StringUtils; import com.fangjia.core.util.DateUtil; @@ -211,6 +213,42 @@ public class DealPriceController { mv.setModel(resMap); return mv; } + + public Object searchListAction(final DealPriceModel model) { + RestfulModelAndView mv = new RestfulModelAndView(); + mv.setViewType("rest"); + + if (StringUtils.isBlank(model.getId())) { + mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "楼盘编号不能为空")); + return mv; + } + District district = districtService.findDistrictById(model.getId()); + DistrictKey districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName()); + + if(district == null){ + mv.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + return mv; + } + DistrictStatBo bo = districtStatService.findCurrentDistrictStat(districtKey); + Integer minPrice = null; + Integer maxPrice = null; + if(bo.getDistrictStat()!=null){ + minPrice = (int)(bo.getDistrictStat().getAvgPrice() * 0.8); + maxPrice = (int)(bo.getDistrictStat().getAvgPrice() * 1.2); + } + Date startDate = null; + Date endDate = null; + if(StringUtils.isNotBlank(model.getStartDate())){ + startDate = DateUtil.parseDate(model.getStartDate(),"yyyyMMdd"); + } + if(StringUtils.isNotBlank(model.getEndDate())){ + endDate = DateUtil.parseDate(model.getEndDate(),"yyyyMMdd"); + } + + List dealPrices = dealPriceService.getNearlySameDealPrice(model.getId(), minPrice, maxPrice, startDate, endDate, model.getLimit()); + mv.setModel(BasicModel.buildOKModel().setResult(dealPrices)); + return mv; + } private List findDealPricesByName(String city,String region ,String name){ Calendar calendar = Calendar.getInstance(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/EvaluationController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/EvaluationController.java index 67e7b084c..7ed1a83f4 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/EvaluationController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/EvaluationController.java @@ -10,9 +10,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.fangjia.dal.mongo.model.BsEvaluation; +import com.fangjia.dal.mongo.model.bkoff.DealPrice; import com.fangjia.service.bo.AddrEvaResult; +import com.fangjia.service.bo.DistrictStatBo; import com.fangjia.service.bo.EvaluationBo; import com.fangjia.service.bo.HouseScorer; +import com.fangjia.service.datastore.*; +import com.fangjia.service.district.DistrictStatService; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; @@ -54,11 +59,6 @@ import com.fangjia.open.model.RestfulModelAndView; import com.fangjia.service.api.AutoCompleteService; import com.fangjia.service.api.KnowbaseService; import com.fangjia.service.common.SellSimilar; -import com.fangjia.service.datastore.BusinessEstateService; -import com.fangjia.service.datastore.DistrictService; -import com.fangjia.service.datastore.EvaluationReportService; -import com.fangjia.service.datastore.EvaluationService; -import com.fangjia.service.datastore.HouseService; import com.fangjia.service.sql.ApiUserService; import com.fangjia.service.sql.UserService; import com.fangjia.service.web.AddressService; @@ -94,6 +94,8 @@ public class EvaluationController { private ApiUserService apiUserService; private UserService userService; private AddressService addressService; + private DistrictStatService districtStatService; + private BsEvaluationService bsEvaluationService; private final static String AK = OpenConfig.getConfig().getBaiduAk(); public Object lngLatEvaluateAction(EvaluationModel model) { @@ -1005,6 +1007,44 @@ public class EvaluationController { return mav; } + public Object bsListAction(EvaluationModel model) { + RestfulModelAndView mv = new RestfulModelAndView(); + mv.setViewType("rest"); + + if (StringUtils.isBlank(model.getId())) { + mv.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "楼盘编号不能为空")); + return mv; + } + District district = districtService.findDistrictById(model.getId()); + DistrictKey districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName()); + + if(district == null){ + mv.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + return mv; + } + DistrictStatBo bo = districtStatService.findCurrentDistrictStat(districtKey); + Integer minPrice = null; + Integer maxPrice = null; + if(bo.getDistrictStat()!=null){ + minPrice = (int)(bo.getDistrictStat().getAvgPrice() * 0.8); + maxPrice = (int)(bo.getDistrictStat().getAvgPrice() * 1.2); + } + Date startDate = null; + Date endDate = null; + if(StringUtils.isNotBlank(model.getStartDate())){ + startDate = DateUtil.parseDate(model.getStartDate(),"yyyyMMdd"); + } + if(StringUtils.isNotBlank(model.getEndDate())){ + endDate = DateUtil.parseDate(model.getEndDate(),"yyyyMMdd"); + } + + List dealPrices = bsEvaluationService.getNearlySameEvaluation(model.getId(), minPrice, maxPrice, startDate, endDate, model.getLimit()); + mv.setModel(BasicModel.buildOKModel().setResult(dealPrices)); + return mv; + } + + + public void setEvaluationService(EvaluationService evaluationService) { this.evaluationService = evaluationService; } @@ -1017,6 +1057,18 @@ public class EvaluationController { this.knowbaseService = knowbaseService; } + + + public void setDistrictStatService(DistrictStatService districtStatService) { + this.districtStatService = districtStatService; + } + + + + public void setBsEvaluationService(BsEvaluationService bsEvaluationService) { + this.bsEvaluationService = bsEvaluationService; + } + public void setAutoCompleteService(AutoCompleteService autoCompleteService) { this.autoCompleteService = autoCompleteService; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java index ebb6c9025..bdf38d8b0 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java @@ -11,6 +11,8 @@ import com.fangjia.dal.mongo.model.DistrictFacilitys; import com.fangjia.dal.mongo.model.FangjiaOfficialAreaMap; import com.fangjia.dal.mongo.model.Metro; import com.fangjia.dal.mongo.model.StatsIndex; +import com.fangjia.dal.seawater.dao.SeawaterDao; +import com.fangjia.dal.seawater.model.Seawater; import com.fangjia.dal.seaweed.model.District; import com.fangjia.dal.sql.model.ApiUser; import com.fangjia.datastore.driver.FacetResult; @@ -29,6 +31,7 @@ import com.fangjia.open.ws.query.CollateralSampleQuery; import com.fangjia.open.ws.query.ShopCollateralSampleQuery; import com.fangjia.service.address.AddressParser; import com.fangjia.service.bo.Collateral; +import com.fangjia.service.bo.DistrictStatBo; import com.fangjia.service.bo.Sample; import com.fangjia.service.bo.ShopSample; import com.fangjia.service.datastore.CzbankSampleService; @@ -39,11 +42,13 @@ import com.fangjia.service.datastore.bean.CollateralSampleQueryBean; import com.fangjia.service.datastore.bean.ShopCollateralSampleQueryBean; import com.fangjia.service.district.DistrictFacilitysService; import com.fangjia.service.district.DistrictStatService; +import com.fangjia.service.district.SqmetreRentService; import com.fangjia.service.menu.Item; import com.fangjia.service.menu.MenuCategoryEnum; import com.fangjia.service.menu.Value; import com.fangjia.service.mongo.fangjia.DealPriceService; import com.fangjia.service.mongo.fangjia.MetroService; +import com.fangjia.service.mongo.fangjia.SeawaterService; import com.fangjia.service.mongo.fangjia.StatsIndexService; import com.fangjia.service.open.FangjiaOfficialAreaService; import com.fangjia.service.open.HousePojo; @@ -86,6 +91,9 @@ public class HouseController { private CzbankSampleService czbankSampleService; private DistrictService districtService; private FangjiaOfficialAreaService fangjiaOfficialAreaService; + + private SeawaterService seawaterService; + private SeawaterDao seawaterDao; private List PROPERTY_TYPE_CODE_LIST = Arrays.asList("01", "02"); @@ -399,6 +407,49 @@ public class HouseController { } } + public Object listAction(final HouseSearchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isBlank(model.getId()) && (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getName()))) { + mav.setModel(BasicModel.buildBadRequestModel("楼盘编号或城市,区域,名称为必填项")); + return mav; + } + District district = null; + DistrictKey districtKey = null; + if(StringUtils.isNotBlank(model.getName())){ + districtKey = new DistrictKey(model.getCity(), model.getRegion(), model.getName()); + district = districtService.findDistrict(districtKey, "district"); + }else{ + district = districtService.findDistrictById(model.getId()); + districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName()); + } + + if(district == null){ + mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + return mav; + } + DistrictStatBo bo = districtStatService.findCurrentDistrictStat(districtKey); + Integer minPrice = null; + Integer maxPrice = null; + if(bo.getDistrictStat()!=null){ + minPrice = (int)(bo.getDistrictStat().getAvgPrice() * 0.8); + maxPrice = (int)(bo.getDistrictStat().getAvgPrice() * 1.2); + } + List names = new ArrayList(); + names.add(district.getName()); + if(district.getAlias() != null){ + for(String alia : district.getAlias()){ + if(StringUtils.isNotBlank(alia) && !names.contains(alia)){ + names.add(alia); + } + } + } + List houses = seawaterDao.findSeawatersFromEs("sell", district.getCity(), district.getRegion(), district.getName(), district.getAlias(), null, model.getStartTime(), model.getEndTime(),null,null,minPrice, maxPrice,null,null,"p_date", false,0, model.getPageSize(),"latest_seawater"); + //List houses1 = seawaterDao.findHouses(district.getCity(), district.getRegion(), names, minPrice, maxPrice, model.getPageSize()); + mav.setModel(BasicModel.buildOKModel().setResult(houses)); + return mav; + } + String getPicUrl(String url, List urls) { if (!urls.contains(url)) { urls.add(url); @@ -832,6 +883,13 @@ public class HouseController { return ret; } + public void setSeawaterService(SeawaterService seawaterService) { + this.seawaterService = seawaterService; + } + + public void setSeawaterDao(SeawaterDao seawaterDao) { + this.seawaterDao = seawaterDao; + } private boolean checkExists(FacetQueryResult houseBoList, HousePojo house) { for (HousePojo bo : houseBoList) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 0d9ca8a80..934ca4cdb 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -665,6 +665,7 @@ public class PropertyController { return mav; } String userId = FangjiaApiUtil.parseUserId(model.getToken()); + District district = null; if (StringUtils.isNotBlank(model.getId())){ if(ObjectId.isValid(model.getId())){ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AuctionModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AuctionModel.java index a4d47a4e6..a12e09a99 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AuctionModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AuctionModel.java @@ -8,6 +8,7 @@ public class AuctionModel extends FangjiaApiModel{ private String city; private String district; private String address; + private String name; private Date minStartTime; private Date maxStartTime; private Integer minStartPrice; @@ -121,4 +122,12 @@ public class AuctionModel extends FangjiaApiModel{ public void setStatus(Integer status) { this.status = status; } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DealPriceModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DealPriceModel.java index 0d51d0c46..35620322f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/DealPriceModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/DealPriceModel.java @@ -1,6 +1,9 @@ package com.fangjia.open.model; +import java.util.Date; + public class DealPriceModel extends FangjiaApiModel{ + private String id; private String city; @@ -34,9 +37,13 @@ public class DealPriceModel extends FangjiaApiModel{ private Double size; private Integer max; + private Integer limit = 10; private String decoration; private boolean convert; + + private String startDate; + private String endDate; public String getCity() { @@ -198,4 +205,36 @@ public class DealPriceModel extends FangjiaApiModel{ public void setConvert(boolean convert) { this.convert = convert; } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + public Integer getLimit() { + return limit; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/EvaluationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/EvaluationModel.java index d5b8f42ed..71130e7bb 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/EvaluationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/EvaluationModel.java @@ -246,6 +246,42 @@ public class EvaluationModel extends FangjiaApiModel { private Date buildDate; private String sid;//微信小程序中的sid private String code;//微信小程序中的code + private String id; + private String startDate; + private String endDate; + private Integer limit = 10; + + public Integer getLimit() { + return limit; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } public String getRegion() { return region; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java index d9f4812d8..63a85c4b3 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java @@ -4,6 +4,7 @@ import com.fangjia.service.datastore.bean.HouseQueryBean; import com.fangjia.service.query.QueryBean; public class HouseSearchModel extends SearchModel { + private String id; private String kind; private String estateType; private String buildingType; @@ -116,7 +117,12 @@ public class HouseSearchModel extends SearchModel { public void setShowDetail(Boolean showDetail) { this.showDetail = showDetail; } - - - + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/SearchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/SearchModel.java index 813f42f6c..8f1311061 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/SearchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/SearchModel.java @@ -16,6 +16,8 @@ public abstract class SearchModel extends FangjiaApiModel { protected Integer totalPriceEnd; protected Integer avgPriceStart; protected Integer avgPriceEnd; + protected Integer startTime; + protected Integer endTime; protected Integer areaStart; protected Integer areaEnd; protected Integer room; @@ -358,4 +360,20 @@ public abstract class SearchModel extends FangjiaApiModel { public void setTotalPrice(Integer totalPrice) { this.totalPrice = totalPrice; } + + public Integer getStartTime() { + return startTime; + } + + public void setStartTime(Integer startTime) { + this.startTime = startTime; + } + + public Integer getEndTime() { + return endTime; + } + + public void setEndTime(Integer endTime) { + this.endTime = endTime; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/BsEvaluationService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/BsEvaluationService.java new file mode 100644 index 000000000..733fcb368 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/BsEvaluationService.java @@ -0,0 +1,11 @@ +package com.fangjia.service.datastore; + +import com.fangjia.dal.mongo.model.BsEvaluation; + +import java.util.Date; +import java.util.List; + +public interface BsEvaluationService { + + List getNearlySameEvaluation(String id, Integer minPrice, Integer maxPrice, Date startDate, Date endDate, Integer limit); +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/BsEvaluationServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/BsEvaluationServiceImpl.java new file mode 100644 index 000000000..4d96aaadd --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/BsEvaluationServiceImpl.java @@ -0,0 +1,44 @@ +package com.fangjia.service.datastore; + +import com.fangjia.dal.QueryParam; +import com.fangjia.dal.SortParam; +import com.fangjia.dal.mongo.dao.BsEvaluationDao; +import com.fangjia.dal.mongo.dao.EvaluationDao; +import com.fangjia.dal.mongo.model.BsEvaluation; +import com.fangjia.dal.mongo.model.bkoff.DealPrice; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class BsEvaluationServiceImpl implements BsEvaluationService { + + private BsEvaluationDao bsEvaluationDao; + + public void setBsEvaluationDao(BsEvaluationDao bsEvaluationDao) { + this.bsEvaluationDao = bsEvaluationDao; + } + + @Override + public List getNearlySameEvaluation(String id, Integer minPrice, Integer maxPrice, Date startDate, Date endDate, Integer limit) { + List params = new ArrayList(); + params.add(new QueryParam("commid", id)); + if(startDate!=null){ + params.add(new QueryParam("cDate", QueryParam.GREATER_THAN_EQUAL_OPERATOR, startDate)); + } + if(endDate!=null){ + params.add(new QueryParam("cDate", QueryParam.LESS_THAN_EQUAL_OPERATOR, startDate)); + } + + if (minPrice > 0) { + params.add(new QueryParam("unitPrice", QueryParam.GREATER_THAN_OPERATOR, minPrice)); + } + if (maxPrice > 0) { + params.add(new QueryParam("unitPrice", QueryParam.LESS_THAN_OPERATOR, maxPrice)); + } + List sortParams = new ArrayList(); + sortParams.add(new SortParam("cDate", false)); + List bsEvaluations = bsEvaluationDao.findAllByParams(params, sortParams, limit); + return bsEvaluations; + } +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceService.java index 9061a3288..fbd4dd7ea 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceService.java @@ -82,6 +82,8 @@ public interface DealPriceService { public List getNearlySameDealPrice(DistrictKey key, int minPrice, int maxPrice, int radius, int limit); + public List getNearlySameDealPrice(String districtId, Integer minPrice, Integer maxPrice,Date startDate, Date endDate, int limit); + public List getDisSameDealPrice(DistrictKey key, int minPrice, int maxPrice, int limit); /** diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceServiceImpl.java index be0f7261f..dd205bd77 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceServiceImpl.java @@ -354,6 +354,29 @@ public class DealPriceServiceImpl implements DealPriceService { return houses; } + @Override + public List getNearlySameDealPrice(String districtId, Integer minPrice, Integer maxPrice, Date startDate, Date endDate, int limit) { + List params = new ArrayList(); + params.add(new QueryParam("matchId", districtId)); + if(startDate!=null){ + params.add(new QueryParam("tradeDate", QueryParam.GREATER_THAN_EQUAL_OPERATOR, startDate)); + } + if(endDate!=null){ + params.add(new QueryParam("tradeDate", QueryParam.LESS_THAN_EQUAL_OPERATOR, startDate)); + } + + if (minPrice > 0) { + params.add(new QueryParam("avgPrice", QueryParam.GREATER_THAN_OPERATOR, minPrice)); + } + if (maxPrice > 0) { + params.add(new QueryParam("avgPrice", QueryParam.LESS_THAN_OPERATOR, maxPrice)); + } + List sortParams = new ArrayList(); + sortParams.add(new SortParam("tradeDate", false)); + List dealPrices = dealPriceDao.findAllByParams(params, sortParams, limit); + return dealPrices; + } + @Override public List getDisSameDealPrice(DistrictKey key, int minPrice, int maxPrice, int limit) { List params = new ArrayList(); From a43af522bb569520754bccc5114141b73e4b9aa5 Mon Sep 17 00:00:00 2001 From: xuhe Date: Thu, 12 May 2022 19:03:28 +0800 Subject: [PATCH 12/42] =?UTF-8?q?=E4=BC=B0=E5=80=BC=E4=BE=9B=E6=95=B0?= =?UTF-8?q?=E6=96=B0=E5=A2=9EMD5=E5=8A=A0=E5=AF=86=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/ccbevaluation/CcbFtpUtils.groovy | 6 ++++ .../ExportOracleEvaluationData.groovy | 23 +++++++++++++++ .../fangjia/script/gj/ccb/FileUtils.groovy | 28 +++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy index 3fffa870c..74474aff6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy @@ -57,6 +57,12 @@ class CcbFtpUtils { ftpUpload(dataCodeFileName)//上传加密码文件到FTP } + static def listFileNames(month){ + //上传到ftp + sftpChannel = reConnect(); + Vector files = sftp.listFiles(ftpPath+ month+"/", sftpChannel); + return files + } static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleEvaluationData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleEvaluationData.groovy index edc128cf1..7258934fa 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleEvaluationData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleEvaluationData.groovy @@ -3,8 +3,10 @@ package com.fangjia.script.ccbevaluation import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.gj.ccb.FileUtils import com.fangjia.script.util.DateUtils +import com.jcraft.jsch.ChannelSftp import groovy.sql.Sql import com.fangjia.script.ccbevaluation.ronghe.SSHHelper +import org.apache.commons.codec.digest.DigestUtils class ExportOracleEvaluationData { def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", @@ -33,6 +35,8 @@ class ExportOracleEvaluationData { exportCommCaseDetailGj(curMonth) def curDate = curMonth.toString()+"28" +// 生成MD5文件 + exportMd5() SSHHelper jschCommand = new SSHHelper(); System.out.println(jschCommand.executeCommand("sh /home/ccb/output/gz_package.sh ${curDate}")); // ok文件 @@ -413,4 +417,23 @@ class ExportOracleEvaluationData { CcbFtpUtils.ftpUpload(null, dataCodeFileName, curDate) } + def exportMd5(){ + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" + Vector files = CcbFtpUtils.listFileNames(curDate) + Iterator fileVec = files.iterator() + def fileRows = [] + while(fileVec.hasNext()){ + ChannelSftp.LsEntry file = fileVec.next() + if(org.apache.commons.lang.StringUtils.isNotBlank(file.getFilename()) && file.getFilename().endsWith(".dat")){ + fileRows << file.getFilename() +":"+ DigestUtils.md5Hex(file.getFilename()) + } + } + def fileName = "/ccb/md5.txt" + if(CommonDatautils.isWindow()){ + fileName = "D:\\房价网\\md5.txt" + } + FileUtils.createTxtFile(fileRows, fileName, "utf-8", false); + CcbFtpUtils.ftpUpload(null, fileName, curDate) + println "md5.txt 上传Ftp完成......" + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/FileUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/FileUtils.groovy index 3e4981856..23513b80b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/FileUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/FileUtils.groovy @@ -50,4 +50,32 @@ class FileUtils { } out.close(); } + + static def createTxtFile(ret, fileName, charset, isAppend){ + File file = new File(fileName); + if (!file.getParentFile().exists()) { + boolean result = file.getParentFile().mkdirs(); + if (!result) { + System.out.println("创建目录失败"); + } + } + + OutputStream out = new FileOutputStream(fileName, isAppend); + def sb = new StringBuffer(); + out.write(sb.toString().getBytes(charset)); + sb.setLength(0) + def index = 0 + for(def row : ret){ + if(row){ + index++ + sb.append(row) + sb.append("\n"); + } + } + if(sb.length()>0){ + out.write(sb.toString().getBytes(charset)); + sb.setLength(0) + } + out.close(); + } } From 6a511eff5a70f9318e27551266aa553ff7da35cb Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Thu, 12 May 2022 22:14:28 +0800 Subject: [PATCH 13/42] =?UTF-8?q?=E6=94=BE=E5=BC=80=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B4=A6=E5=8F=B7=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/service/address/processor/CityProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java index 6f88c20ef..6ae746ab5 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java @@ -52,8 +52,8 @@ public class CityProcessor extends AbstractAddressProcessor { } if(StringUtils.isNotBlank(city) && CityStatus.SURE != address.getCityStatus() ){ String formatCity = RegionData.formatCity(city); - String possibleCity = AddressParserGoal.Match.equals(address.getAddressParserGoal()) ? parseCityFromAddress(orgAddress, address) : null; - String confirmCity = AddressParserGoal.Match.equals(address.getAddressParserGoal()) ? null : formatCity; + String possibleCity = AddressParserGoal.Match.equals(address.getAddressParserGoal()) || address.getAddressParserGoal() == null ? parseCityFromAddress(orgAddress, address) : null; + String confirmCity = AddressParserGoal.Match.equals(address.getAddressParserGoal()) || address.getAddressParserGoal() == null? null : formatCity; /**如果省份和城市信息相互矛盾 则用区域推断城市*/ if(StringUtils.isNotBlank(address.getProvince()) && !ProvinceData.belongTo(formatCity, address.getProvince())){ List possibleCities = speculateCityNameByRegion(address, city); From e1ff6a3ab75b9e1606185d2c6e65452941c3698d Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Thu, 12 May 2022 22:17:19 +0800 Subject: [PATCH 14/42] =?UTF-8?q?=E6=94=BE=E5=BC=80=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B4=A6=E5=8F=B7=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/script/util/DbUtils.groovy | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DbUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DbUtils.groovy index 3b83880cd..c39e16b2e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DbUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DbUtils.groovy @@ -92,11 +92,6 @@ public class DbUtils{ } } - - public static void executeQueryOnSeawater(BasicDBObject query,Closure c, BasicDBObject fields = null){ - seawater.find(query,fields).batchSize(10000).each(c) - } - public static void executeQueryOnSeaweed(BasicDBObject query,Closure c, BasicDBObject fields = null){ SEAWEED_SLAVE.find(query,fields).batchSize(1000).each(c) } @@ -171,10 +166,6 @@ public class DbUtils{ return SEAWEED_SLAVE.findOne(query,fields); } - public static int executeCountOnSeawater(BasicDBObject query){ - return seawater.count(query); - } - public static BasicDBObject buildSeaweedQuery(def city = null, def region = null, def name = null, def cat = "district", def visible = 0){ BasicDBObject query = new BasicDBObject() if(city){ @@ -350,31 +341,6 @@ public class DbUtils{ return district.lat && district.lng && district.lng > 0 && district.lat > 0 } -/** - * 记录修改小区库的操作日志 - * @param city - * @param region - * @param name - * @return - */ - def static saveDeleteLog(String city, String region,String name,String category,int status){ - if(status!=1){ - return - } - DBObject obj = new BasicDBObject() - obj.put("city", city); - obj.put("region", region); - obj.put("district_name", name); - obj.put("category" , category) - obj.put("origin" , "脚本") - if(status==1){ - obj.put("type" , "remove") - } - obj.put("c_date" , new Date()) - obj.put("m_date" , new Date()) - OPERATION_LOG.save(obj) - } - public static DBCollection getCollection(String host, int port, String dbName ,String collName){ def collection = COLL_CACHE["${host}#${port}#${dbName}#${collName}"] if(!collection){ From 0fab2bc076264571d8e4dd2db53db1b076fef94b Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 12 May 2022 23:24:31 +0800 Subject: [PATCH 15/42] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/core/util/SeaweedUtils.java | 202 ++++++++++++++++++ .../dal/mongo/fangjia/model/PaiMai.java | 27 +++ .../open/controllers/AuctionController.java | 39 ++++ .../open/controllers/PropertyController.java | 10 +- 4 files changed, 273 insertions(+), 5 deletions(-) create mode 100644 projects/fangjia-core/src/main/java/com/fangjia/core/util/SeaweedUtils.java diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/SeaweedUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/SeaweedUtils.java new file mode 100644 index 000000000..698833bd5 --- /dev/null +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/SeaweedUtils.java @@ -0,0 +1,202 @@ +package com.fangjia.core.util; + +import org.apache.commons.lang.StringUtils; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class SeaweedUtils { + public static void main(String[] args){ + System.out.println(formatVirescencePercent("1")); + } + /** + * 标准化输出绿化率 + */ + public static String formatVirescencePercent(String virescence_percent) { + // 绿化率 + if (StringUtils.isNotBlank(virescence_percent) && checkValue(virescence_percent)!=null) { + double val = Double.valueOf(virescence_percent); + if (val < 1) { + return String.valueOf(val * 100); + } + if (val == 1) { + return String.valueOf(val * 10); + } + if (val >= 70) { + return "65"; + } + return String.valueOf(val); + } + return null; + } + + /** + * 标准化容积率输出 + */ + public static String formatCubagePercent(String cubage_percent) { + if (StringUtils.isNotBlank(cubage_percent) && checkValue(cubage_percent)!=null) { + double val = Double.valueOf(cubage_percent); + if (val >= 7 && val < 8) { + return "6.2"; + } + if (val >= 8 && val < 9) { + return "6.3"; + } + if (val >= 9 && val < 10) { + return "6.5"; + } + if (val >= 10) { + return "6.7"; + } + return String.valueOf(val); + } + return null; + } + + /** + * 标准化车位输出 + */ + public static String formatCarSiteCount(String car_site_count) { + if (StringUtils.isNotBlank(car_site_count) && checkValue(car_site_count)!=null) { + long val = Long.valueOf(car_site_count); + if (val > 2500 || val < 100) { + return ""; + } + return String.valueOf(val); + } + return null; + } + + /** + * 标准化户数输出 + */ + public static String formatHouseholdCount(String household_count) { + if (StringUtils.isNotBlank(household_count) && checkValue(household_count)!=null ) { + if (Integer.valueOf(household_count) < 50) { + return null; // 户数 + } + return household_count; + } + return null; + } + + /** + * 标准化总占地面积输出 + */ + public static String formatAllArea(String all_area) { + if (StringUtils.isNotBlank(all_area)) { + Double formattedVal = 0.0; + if (all_area.toString().indexOf("公顷") != -1) { + String val = all_area.toString(); + formattedVal = (Double.valueOf(val.substring(0, val.indexOf("公顷"))) * 10000); + } else if(checkValue(all_area)!=null) { + formattedVal = Double.valueOf(all_area); + } + if (formattedVal > 100000 || formattedVal == 0.0) { + return null; + } + return String.valueOf(formattedVal); + } + return null; + } + + /** + * 提取浮点数与整数 + */ + static String getNumber(String input) { + Pattern pattern = Pattern.compile("\\d+(\\.\\d+)?"); + Matcher matcher = pattern.matcher(input); + List list = new ArrayList(); + while (matcher.find()) { + list.add(matcher.group()); + } + if(list.size()>0){ + return list.get(0); + } + return null; + } + + + + + static Float checkValue(String value){ + if(StringUtils.isNotBlank(value)){ + value = getNumber(value); + if(StringUtils.isNotBlank(value)){ + value = subZeroAndDot(value); + if(isNumber(value)){ + Float v = Float.parseFloat(value); + if(v>0){ + return v; + }else{ + return null; + } + }else if(isFloat(value)){ + Float v = Float.parseFloat(value); + if(v>0){ + return v; + }else{ + return null; + } + } else{ + return null; + } + } + } + return null; + } + + static boolean isNumber(String str){ + try { + Integer.parseInt(str); + } catch (NumberFormatException e) { + return false; + } + return true; + } + + static boolean isFloat(String str){ + try { + Float.parseFloat(str); + } catch (NumberFormatException e) { + return false; + } + return true; + } + + /** + * 正则表达式去掉多余的.与0 + * @param + * @return + */ + static String subZeroAndDot(String v){ + + if(StringUtils.isNotBlank(v)){ + if(v.indexOf(".")!=-1){ + Double myNum2 = Double.valueOf(v); + BigDecimal b = new java.math.BigDecimal(myNum2); + Double myNum3 = b.setScale(2, java.math.BigDecimal.ROUND_HALF_UP).doubleValue(); + v = myNum3.toString(); + } + + if(v.indexOf(".")>-1){ + while(true) + { + if(v.endsWith("0")){ + v = v.substring(0,v.length()-1); + }else{ + break; + } + } + if(v.endsWith(".")){ + v=v.substring(0,v.length()-1); + } + } + } + return v; + } + +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/PaiMai.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/PaiMai.java index fa5f7cb2f..e7a406dc8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/PaiMai.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/model/PaiMai.java @@ -99,6 +99,9 @@ public class PaiMai implements MongoEntity { private Integer marketAvgPrice; /**物业类型*/ private String matchEstateType; + private String houseNum; + private String unitNum; + private String roomNum; @Id @GeneratedValue @@ -488,4 +491,28 @@ public class PaiMai implements MongoEntity { public void setMatchEstateType(String matchEstateType) { this.matchEstateType = matchEstateType; } + + public String getHouseNum() { + return houseNum; + } + + public void setHouseNum(String houseNum) { + this.houseNum = houseNum; + } + + public String getUnitNum() { + return unitNum; + } + + public void setUnitNum(String unitNum) { + this.unitNum = unitNum; + } + + public String getRoomNum() { + return roomNum; + } + + public void setRoomNum(String roomNum) { + this.roomNum = roomNum; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java index ed4a73f2d..8d09d50b1 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java @@ -1,6 +1,7 @@ package com.fangjia.open.controllers; import com.fangjia.core.util.DateUtil; +import com.fangjia.core.util.HttpRequest; import com.fangjia.dal.QueryParam; import com.fangjia.dal.SortParam; import com.fangjia.dal.common.DistrictKey; @@ -14,6 +15,7 @@ import com.fangjia.open.model.BasicModel; import com.fangjia.open.model.RestfulModelAndView; import com.fangjia.service.fsh.DistrictNewPriceService; import com.fangjia.service.open.PaiMaiService; +import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; import org.bson.types.ObjectId; @@ -204,10 +206,47 @@ public class AuctionController { List sortParams = new ArrayList(); sortParams.add(new SortParam("startDate", false)); List paimais = paiMaiService.findAll(params, sortParams, model.getLimit(), SEARCH_FIELDS); + if(paimais!=null && paimais.size()>0){ + for(PaiMai paiMai : paimais){ + Map map = standard(paiMai.getCity(), paiMai.getAddress()); + if(map!=null){ + paiMai.setHouseNum((String) map.get("buildingNumber")); + paiMai.setUnitNum((String) map.get("unitNumber")); + paiMai.setRoomNum((String) map.get("roomNumber")); + } + } + } mav.setModel(BasicModel.buildOKModel().setResult(paimais)); return mav; } + + private Map standard(String city, String address){ + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", city); + params.put("address", address); + 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"); + if(json.containsKey("result")){ + return (Map)json.get("result"); + } + } + return null; + } + public void setPaiMaiService(PaiMaiService paiMaiService) { this.paiMaiService = paiMaiService; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 934ca4cdb..0b0dce39f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -734,13 +734,13 @@ public class PropertyController { districtInfoDto.setCommunity(district.getStreetCommunity()); districtInfoDto.setCommercialArea(district.getBusinessQuarter()); if (district.getHouseholdCount() != null) { - districtInfoDto.setTotalUnitCount(district.getHouseholdCount().toString()); + districtInfoDto.setTotalUnitCount(SeaweedUtils.formatHouseholdCount(district.getHouseholdCount().toString())); } else { districtInfoDto.setTotalUnitCount(""); } districtInfoDto.setManagementFee(district.getEstateCharge()); if (district.getCarSiteCount() != null) { - districtInfoDto.setParking(district.getCarSiteCount().toString()); + districtInfoDto.setParking(SeaweedUtils.formatCarSiteCount(district.getCarSiteCount().toString())); } else { districtInfoDto.setParking(""); } @@ -761,10 +761,10 @@ public class PropertyController { districtInfoDto.setFinishBuildTime(district.getFinishBuildingDate()); districtInfoDto.setMoveinTime(district.getLiveDate()); - districtInfoDto.setFloorSpace(district.getAllArea()); + districtInfoDto.setFloorSpace(SeaweedUtils.formatAllArea(district.getAllArea())); districtInfoDto.setConstructionSpace(district.getBuildArea()); - districtInfoDto.setPlotRatio(district.getCubagePercent()); - districtInfoDto.setGreenPercentage(district.getVirescencePercent()); + districtInfoDto.setPlotRatio(SeaweedUtils.formatCubagePercent(district.getCubagePercent())); + districtInfoDto.setGreenPercentage(SeaweedUtils.formatVirescencePercent(district.getVirescencePercent())); districtInfoDto.setPreSalePermit(district.getLicence()); districtInfoDto.setDeveloper(district.getDeveloper()); districtInfoDto.setDiscount(district.getDiscount()); From 606c17bbe76bdd8a53fa4cf2fee38685b64b45fe Mon Sep 17 00:00:00 2001 From: xuhe Date: Sat, 14 May 2022 09:20:01 +0800 Subject: [PATCH 16/42] =?UTF-8?q?=E5=BB=BA=E8=A1=8C=E8=9E=8D=E5=90=88?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BB=BA=E7=AD=91=E7=BB=93=E6=9E=84=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E5=80=BC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/script/gj/ccb/CcbCodeUtils.groovy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy index 1dabf3ada..66ff6a8f3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy @@ -199,18 +199,18 @@ class CcbCodeUtils { static def getBuildStructureCode(def buildStructure){ if(buildStructure){ if(buildStructure.contains("钢结构")){ - return "001"; + return "3"; }else if(buildStructure.contains("钢、钢筋混凝土结构")){ - return "002"; + return "1"; }else if(buildStructure.contains("钢筋混凝土结构")){ - return "003"; + return "1"; }else if(buildStructure.contains("砖木结构")){ - return "004"; + return "10"; }else if(buildStructure.contains("混合结构")){ - return "005"; + return "2"; } } - return "006"; + return "11"; } static def getDistHouseTypeCode(def estateType){ From 6af5da836c28eecdea6886146398c42660006628 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Wed, 18 May 2022 15:45:01 +0800 Subject: [PATCH 17/42] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=B4=E6=A0=8F?= =?UTF-8?q?=EF=BC=8C=E9=99=90=E5=88=B6=E5=8C=B9=E9=85=8D=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../address/AddressParserServiceImpl.java | 28 +++--- .../fangjia/service/address/mode/Address.java | 18 ++++ .../address/processor/AddressProcessors.java | 4 +- .../address/processor/CityProcessor.java | 22 ++--- .../address/processor/DistrictProcessor.java | 3 + .../address/processor/GeoProcessor.java | 87 ++++++++----------- .../processor/VillageNameProcessor.java | 9 -- .../service/cnAnalyzer/CnTokenizer.java | 24 ++--- 8 files changed, 93 insertions(+), 102 deletions(-) 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 46545fc04..1d5947440 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 @@ -759,6 +759,13 @@ public class AddressParserServiceImpl implements AddressParserService { double simScore; boolean onSameRoad = false; boolean sameDistrict = isSameDistrict(address, metaData); + if(PreciseLevel.STRICT == address.getPreciseLevel() && !sameDistrict){ + return 0; + } + //当地图解析出来的区域和用户地址中的区域一致时,只匹配指定区域下面的小区 + if(address.getGeoRegion() != null && address.getGeoRegion().equals(address.getDistrict()) && !sameDistrict){ + return 0; + } Iterator> addrEntrySet = metaData.getAddrePinYinMap().entrySet().iterator(); Map.Entry addrEntry; while(addrEntrySet.hasNext()){ @@ -808,7 +815,6 @@ public class AddressParserServiceImpl implements AddressParserService { } } } - String keywordPinYin = address.getKeywordsPinYin(); String keywords = address.getKeywords(); String fuzzyKeywordsPinYin = address.getFuzzyKeywordsPinYin(); @@ -904,23 +910,25 @@ public class AddressParserServiceImpl implements AddressParserService { double matchLevelScore = 0; double similarityScore = 0; - if (standardAddressScore > 0 && keywordScore > 0) { + if(metaData.getId().equals(address.getPolygonSeaweedId())){ matchLevelScore = 0.9; - similarityScore = Math.max(standardAddressScore, keywordScore) * SIMILARITY_RATE; - } else if(keywordScore > 0 && streetScore > 0){ + similarityScore = 0.05; + }else if (standardAddressScore > 0 && keywordScore > 0) { matchLevelScore = 0.8; - similarityScore = Math.max(streetScore, keywordScore * 0.8) * SIMILARITY_RATE; + similarityScore = Math.max(standardAddressScore, keywordScore) * SIMILARITY_RATE; } else if (standardAddressScore > 0) { matchLevelScore = 0.7; similarityScore = standardAddressScore * SIMILARITY_RATE; + } else if(keywordScore > 0 && streetScore > 0){ + matchLevelScore = 0.6; + similarityScore = Math.max(streetScore, keywordScore * 0.8) * SIMILARITY_RATE; } else if (keywordScore > 0) { matchLevelScore = 0.6; similarityScore = keywordScore * SIMILARITY_RATE; } else if (fuzzyKeywordsScore > 0) { - matchLevelScore = 0.5; + matchLevelScore = 0.4; similarityScore = fuzzyKeywordsScore * SIMILARITY_RATE; } - if (similarityScore > 0) { if(metaData.getBuildingType() != null){ if ("shop".equals(metaData.getBuildingType().toString())) { @@ -942,10 +950,6 @@ public class AddressParserServiceImpl implements AddressParserService { * similarityScore = 相似度部分(0.07) + 类型部分(0.01) < 0.1 * */ double score = matchLevelScore + similarityScore; - if(address.hasCoordinate() && metaData.hasCoordinate() - && GeoUtils.calculateDistance(address.getLng(), address.getLat(), metaData.getLng(), metaData.getLat()) > 3 * 1000){ - score = 0d; - } return score; } @@ -980,7 +984,7 @@ public class AddressParserServiceImpl implements AddressParserService { return false; } if(StringUtils.isBlank(address.getDistrict()) && StringUtils.isBlank(address.getSuggestDistrict())){ - return false; + return true; } String district = metaData.getDistrict(); return district.equals(address.getDistrict()) || district.equals(address.getSuggestDistrict()); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java index 720da51bb..ed723c1d5 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java @@ -61,6 +61,8 @@ public class Address { private String suggestDistrict; private String suggestName; private String suggestNamePinYin; + private String polygonSeaweedId; + private String geoRegion; private List buildingNumbers; private PreciseLevel preciseLevel; private boolean pinYin; @@ -750,6 +752,14 @@ public class Address { return false; } + public String getGeoRegion() { + return geoRegion; + } + + public void setGeoRegion(String geoRegion) { + this.geoRegion = geoRegion; + } + @Override public String toString() { return "Address{" + @@ -809,6 +819,14 @@ public class Address { '}'; } + public String getPolygonSeaweedId() { + return polygonSeaweedId; + } + + public void setPolygonSeaweedId(String polygonSeaweedId) { + this.polygonSeaweedId = polygonSeaweedId; + } + public String toMd5Hex(){ String keyProperties = "Address{" + "city='" + city + '\'' + diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/AddressProcessors.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/AddressProcessors.java index aa72e6d01..9097a3a63 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/AddressProcessors.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/AddressProcessors.java @@ -20,11 +20,9 @@ public class AddressProcessors{ static { //修改顺序需要调整process i 的值 - addressProcessors.add(new TokenProcessor()); addressProcessors.add(new ProximalCharactersProcessor()); addressProcessors.add(new PreNoiseProcessor()); addressProcessors.add(new AddressFormatProcessor()); - addressProcessors.add(new TokenProcessor()); addressProcessors.add(new FloorProcessor()); addressProcessors.add(new TooltipProcessor()); addressProcessors.add(new ProvinceProcessor()); @@ -44,7 +42,7 @@ public class AddressProcessors{ addressProcessors.add(new NumericProcessor()); addressProcessors.add(new ProvinceAdjustProcessor()); addressProcessors.add(new FormatProcessor()); -// addressProcessors.add(new GeoProcessor()); + addressProcessors.add(new GeoProcessor()); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java index 6ae746ab5..130b7eea9 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java @@ -52,6 +52,7 @@ public class CityProcessor extends AbstractAddressProcessor { } if(StringUtils.isNotBlank(city) && CityStatus.SURE != address.getCityStatus() ){ String formatCity = RegionData.formatCity(city); + address.setCity(formatCity); String possibleCity = AddressParserGoal.Match.equals(address.getAddressParserGoal()) || address.getAddressParserGoal() == null ? parseCityFromAddress(orgAddress, address) : null; String confirmCity = AddressParserGoal.Match.equals(address.getAddressParserGoal()) || address.getAddressParserGoal() == null? null : formatCity; /**如果省份和城市信息相互矛盾 则用区域推断城市*/ @@ -191,7 +192,6 @@ public class CityProcessor extends AbstractAddressProcessor { }else{ weight.score += 2; } - }else if(address.contains(city)){ index = address.indexOf(city); weight.index = index; @@ -208,9 +208,11 @@ public class CityProcessor extends AbstractAddressProcessor { if(matchResult !=null){ address = address.replace(matchResult.matchContent, ""); } - if(address.indexOf(region, index) > -1){ + if(address.indexOf(region + "区", index) > -1 || address.indexOf(region + "县", index) > -1){ if(province != null && (orgAddress.contains(province + region) || orgAddress.contains(ProvinceData.getDisplay(province) + region))){ weight.score += 2; + }else if(city.equals(addr.getCity())){ + weight.score += 10; }else{ weight.score += 1; } @@ -223,7 +225,11 @@ public class CityProcessor extends AbstractAddressProcessor { for(String alia : alias){ if(StringUtils.isNotBlank(alia) && !alia.equals(region) && address.indexOf(alia, index) > -1 && (alia.endsWith("市")|(alia.endsWith("县")))){ - weight.score += 1; + if(city.equals(addr.getCity())){ + weight.score += 10; + }else{ + weight.score += 1; + } weight.index = address.indexOf(alia, index); break; } @@ -237,16 +243,6 @@ public class CityProcessor extends AbstractAddressProcessor { } List weights = new ArrayList(weightMap.values()); if(weights.size() > 0){ - /*String street = getStreet(address); - if(street != null){ - Iterator iterator = weights.iterator(); - while(iterator.hasNext()){ - FragmentWeight fragmentWeight = iterator.next(); - if(match(street, ".*" + fragmentWeight.text + "[东南西北中一二三四五六七八九十百千\\d]?(路|街|大道|支路|村)")){ - iterator.remove(); - } - } - }*/ Collections.sort(weights); } if(weights.size() > 0){ diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/DistrictProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/DistrictProcessor.java index 5cfba96b5..697e69f8d 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/DistrictProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/DistrictProcessor.java @@ -167,6 +167,9 @@ public class DistrictProcessor extends AbstractAddressProcessor { address.setDevelopmentZone(dz); } } + if(address.getSuggestDistrict() != null && address.getDistrict() == null){ + address.setDistrict(address.getSuggestDistrict()); + } address.setAddress(orgAddress); address.setEffectiveAddress(address.getAddress()); return RepeatStatus.NEXT; diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java index 83d74a0d4..c72141550 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java @@ -5,8 +5,11 @@ import com.fangjia.core.util.HttpRequest; import com.fangjia.service.address.mode.Address; import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import org.apache.commons.lang.StringUtils; -import java.util.*; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 地址经纬度处理器 @@ -18,7 +21,6 @@ public class GeoProcessor extends AbstractAddressProcessor { private static final String KEY = "4ccfe3c898a9489884bd2bcb1ef6dcde"; List POI_LEVELS = Arrays.asList("村庄", "热点商圈", "兴趣点", "门牌号", "单元号", "道路交叉路口"); - List DISTRICT_LEVEL = Arrays.asList("区县", "开发区", "乡镇", "村庄", "热点商圈", "兴趣点", "门牌号", "单元号", "道路交叉路口"); @Override public RepeatStatus process(Address address) { @@ -26,68 +28,55 @@ public class GeoProcessor extends AbstractAddressProcessor { if (address.hasCoordinate()) { return RepeatStatus.NEXT; } - List queryTypes = new ArrayList(); - List addressList = new ArrayList(); - if (address.isStandardAddress()) { - addressList.add(address.getStandardAddress()); - queryTypes.add("StandardAddress"); - } - if (StringUtils.isNotBlank(address.getOrgKeywords())) { - addressList.add(address.getOrgKeywords()); - queryTypes.add("Keywords"); - } HttpRequest request = new HttpRequest(); Map params = new HashMap(); - params.put("address", StringUtils.join(addressList, "|")); + params.put("address", address.getOrgAddress()); params.put("key", KEY); params.put("city", address.getCity()); - params.put("batch", "true"); params.put("output", "json"); try { JSONObject response = request.getJsonContent("https://restapi.amap.com/v3/geocode/geo", params, "UTF-8"); if (response.getInt("status") == 1) { JSONArray geocodes = response.getJSONArray("geocodes"); - if(queryTypes.contains("StandardAddress")){ - JSONObject geocode = geocodes.getJSONObject(queryTypes.indexOf("StandardAddress")); - String level = geocode.getString("level"); - if(DISTRICT_LEVEL.contains(level)){ - if(StringUtils.isBlank(address.getDistrict())){ - address.setDistrict(RegionData.formatRegion(address.getCity(), geocode.getString("district"))); + if(geocodes.size() > 0){ + JSONObject json = geocodes.getJSONObject(0); + if(json.get("district") instanceof String){ + String city = address.getCity(); + if(city == null){ + city = RegionData.formatCity(json.getString("city")); } + String region = RegionData.formatRegion(city, json.getString("district")); + address.setGeoRegion(region); } - if(geocode.containsKey("street") && geocode.containsKey("number")){ - String geocodeAddress = geocode.getString("street") + geocode.getString("number"); - if(address.getStandardAddress().contains(geocodeAddress)){ - String location = geocode.getString("location"); - address.setLng(Double.parseDouble(location.split(",")[0])); - address.setLat(Double.parseDouble(location.split(",")[1])); - } - } - } - if(queryTypes.contains("Keywords")){ - JSONObject geocode = geocodes.getJSONObject(queryTypes.indexOf("Keywords")); - String level = geocode.getString("level"); - if(DISTRICT_LEVEL.contains(level)){ - if(StringUtils.isBlank(address.getDistrict())){ - address.setDistrict(RegionData.formatRegion(address.getCity(), geocode.getString("district"))); - } - } - if(POI_LEVELS.contains(level)){ - String formattedAddress = geocode.getString("formatted_address"); - formattedAddress = formattedAddress - .replaceFirst(geocode.getString("province"), "") - .replaceFirst(geocode.getString("city"), "") - .replaceFirst(geocode.getString("district"), ""); - if(formattedAddress.equals(address.getOrgKeywords())){ - String location = geocode.getString("location"); - address.setLng(Double.parseDouble(location.split(",")[0])); - address.setLat(Double.parseDouble(location.split(",")[1])); + if(POI_LEVELS.contains(json.getString("level"))){ + //对于门牌号级别的POI,formatted_address中包含|代表是推测出来的路号,重庆市巴南区凤林路|808号,|号楼 + if("门牌号".equals(json.getString("level"))){ + if(!(json.get("number") instanceof JSONArray) && json.getString("formatted_address").contains("|" + json.getString("number"))){ + return RepeatStatus.NEXT; + } } + String location = json.getString("location"); + address.setLng(Double.valueOf(location.split(",")[0])); + address.setLat(Double.valueOf(location.split(",")[1])); + String tmp = "{ \"_source\": [\"seaweed_id\"], \"query\": {\"geo_shape\": {\"shape\": {\"shape\": {\"type\": \"Point\",\"coordinates\":[location]},\"relation\": \"CONTAINS\"}}}}"; + tmp = tmp.replace("location", location); + Map headers = new HashMap(); + headers.put("Authorization","Basic ZGV2ZWxvcGVyOjVlOGVkZDg1MWQyZmRmYmQ3NDE1MjMyYzY3MzY3Y2Mz"); + JSONObject resp = JSONObject.fromObject(request.postWithBody("http://192.168.0.206:9200/seaweed_polygon/_search", JSONObject.fromObject(tmp),headers,"UTF-8")); + if(resp.containsKey("hits") && resp.getJSONObject("hits").containsKey("hits")){ + JSONArray hits = resp.getJSONObject("hits").getJSONArray("hits"); + if(hits.size() > 0){ + String seaweedId = hits.getJSONObject(0).getJSONObject("_source").getString("seaweed_id"); + address.setPolygonSeaweedId(seaweedId); + } + } + } } + } } catch (Exception e) { - + e.printStackTrace(); } return RepeatStatus.NEXT; } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/VillageNameProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/VillageNameProcessor.java index 5236b7d55..797d9e367 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/VillageNameProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/VillageNameProcessor.java @@ -15,15 +15,6 @@ public class VillageNameProcessor extends AbstractAddressProcessor { @Override public AbstractAddressProcessor.RepeatStatus process(Address address) { String orgAddress = address.getAddress(); - if(address.getTokens()!=null){ - for(Token token:address.getTokens()){ - if("district".equals(token.getKeywordTypes())){ - address.setKeywords(token.getName()); - address.setAddress(orgAddress.replace(token.getName(),"")); - return RepeatStatus.NEXT; - } - } - } List names = tokenDistrictNames(orgAddress); List kws = new ArrayList(); for(String name : names){ diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/cnAnalyzer/CnTokenizer.java b/projects/fangjia-service/src/main/java/com/fangjia/service/cnAnalyzer/CnTokenizer.java index de010e201..c216a1eba 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/cnAnalyzer/CnTokenizer.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/cnAnalyzer/CnTokenizer.java @@ -1,24 +1,16 @@ package com.fangjia.service.cnAnalyzer; -import java.io.IOException; -import java.io.StringReader; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang.StringUtils; -import org.apache.solr.client.solrj.util.ClientUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.fangjia.core.util.DataUtil; import com.goojia.solr.ganalytics.IKSegmentation; import com.goojia.solr.ganalytics.Lexeme; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.io.StringReader; +import java.io.UnsupportedEncodingException; +import java.util.*; /** * 房价网分词器 From 4f9f04418249e8a5ca266c3d556bfd7034303dda Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Wed, 18 May 2022 17:58:36 +0800 Subject: [PATCH 18/42] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=B4=E6=A0=8F?= =?UTF-8?q?=EF=BC=8C=E9=99=90=E5=88=B6=E5=8C=B9=E9=85=8D=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/address/AddressParserServiceImpl.java | 8 ++++---- .../service/address/processor/GeoProcessor.java | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) 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 1d5947440..bd0be4380 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 @@ -762,10 +762,10 @@ public class AddressParserServiceImpl implements AddressParserService { if(PreciseLevel.STRICT == address.getPreciseLevel() && !sameDistrict){ return 0; } - //当地图解析出来的区域和用户地址中的区域一致时,只匹配指定区域下面的小区 - if(address.getGeoRegion() != null && address.getGeoRegion().equals(address.getDistrict()) && !sameDistrict){ - return 0; - } +// //当地图解析出来的区域和用户地址中的区域一致时,只匹配指定区域下面的小区 +// if(address.getGeoRegion() != null && address.getGeoRegion().equals(address.getDistrict()) && !sameDistrict){ +// return 0; +// } Iterator> addrEntrySet = metaData.getAddrePinYinMap().entrySet().iterator(); Map.Entry addrEntry; while(addrEntrySet.hasNext()){ diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java index c72141550..d0c3e88ac 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java @@ -20,7 +20,7 @@ public class GeoProcessor extends AbstractAddressProcessor { private static final String KEY = "4ccfe3c898a9489884bd2bcb1ef6dcde"; - List POI_LEVELS = Arrays.asList("村庄", "热点商圈", "兴趣点", "门牌号", "单元号", "道路交叉路口"); + List POI_LEVELS = Arrays.asList("村庄", "热点商圈", "兴趣点", "门牌号", "单元号", "道路交叉路口", "门牌号"); @Override public RepeatStatus process(Address address) { @@ -50,11 +50,11 @@ public class GeoProcessor extends AbstractAddressProcessor { } if(POI_LEVELS.contains(json.getString("level"))){ //对于门牌号级别的POI,formatted_address中包含|代表是推测出来的路号,重庆市巴南区凤林路|808号,|号楼 - if("门牌号".equals(json.getString("level"))){ - if(!(json.get("number") instanceof JSONArray) && json.getString("formatted_address").contains("|" + json.getString("number"))){ - return RepeatStatus.NEXT; - } - } +// if("门牌号".equals(json.getString("level"))){ +// if(!(json.get("number") instanceof JSONArray) && json.getString("formatted_address").contains("|" + json.getString("number"))){ +// return RepeatStatus.NEXT; +// } +// } String location = json.getString("location"); address.setLng(Double.valueOf(location.split(",")[0])); address.setLat(Double.valueOf(location.split(",")[1])); From 6f69ca6a3394b0f2ec2d4228436a0d615515a966 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Wed, 18 May 2022 19:55:28 +0800 Subject: [PATCH 19/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=91=A8=E8=BE=B9?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mongo/open/dao/CommunityPoiDao.java | 9 ++ .../open/dao/impl/CommunityPoiDaoImpl.java | 10 ++ .../dal/mongo/open/model/CommunityPoi.java | 135 ++++++++++++++++++ .../open/controllers/PropertyController.java | 23 +++ .../service/open/CommunityPoiService.java | 8 ++ .../open/impl/CommunityPoiServiceImpl.java | 19 +++ 6 files changed, 204 insertions(+) create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/CommunityPoiDao.java create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/impl/CommunityPoiDaoImpl.java create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityPoi.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/open/CommunityPoiService.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/open/impl/CommunityPoiServiceImpl.java diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/CommunityPoiDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/CommunityPoiDao.java new file mode 100644 index 000000000..97f9d48de --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/CommunityPoiDao.java @@ -0,0 +1,9 @@ +package com.fangjia.dal.mongo.open.dao; + +import com.fangjia.dal.MongoDao; +import com.fangjia.dal.mongo.model.CountDistrictStatBycity; +import com.fangjia.dal.mongo.open.model.CommunityPoi; + +public interface CommunityPoiDao extends MongoDao { + +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/impl/CommunityPoiDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/impl/CommunityPoiDaoImpl.java new file mode 100644 index 000000000..e8a317b04 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/impl/CommunityPoiDaoImpl.java @@ -0,0 +1,10 @@ +package com.fangjia.dal.mongo.open.dao.impl; + +import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.mongo.open.dao.ApiVisitCountDao; +import com.fangjia.dal.mongo.open.dao.CommunityPoiDao; +import com.fangjia.dal.mongo.open.model.CommunityPoi; +import com.fangjia.dal.mongo.tool.model.ApiVisitCount; + +public class CommunityPoiDaoImpl extends MongoDaoImpl implements CommunityPoiDao { +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityPoi.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityPoi.java new file mode 100644 index 000000000..8427b5aa7 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityPoi.java @@ -0,0 +1,135 @@ +package com.fangjia.dal.mongo.open.model; + +import com.fangjia.dal.MongoEntity; + +import javax.persistence.*; +import java.util.Date; + +/** + * 小区周边配套统计信息 + * + * @author shenjian@fangjia.com + */ +@Entity +@Table(name = "fangjia_stat.community_poi_gj") +public class CommunityPoi implements MongoEntity { + + private static final long serialVersionUID = -7663644539542318409L; + + private String id; + private String city; + private String region; + private String name; + private Integer subway; + private Integer traffic; + private Integer bank; + private Integer primary; + private Integer junior; + private Integer hospital; + /** + * 不利设施,丧葬 + */ + private Integer funeral; + + @Id + @Column(name = "_id") + @Override + public String getId() { + return id; + } + + @Override + public void setId(String id) { + this.id = id; + } + + @Column(name = "city") + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + @Column(name = "region") + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + @Column(name = "name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Column(name = "subway") + public Integer getSubway() { + return subway; + } + + public void setSubway(Integer subway) { + this.subway = subway; + } + + @Column(name = "traffic") + public Integer getTraffic() { + return traffic; + } + + public void setTraffic(Integer traffic) { + this.traffic = traffic; + } + + @Column(name = "bank") + public Integer getBank() { + return bank; + } + + public void setBank(Integer bank) { + this.bank = bank; + } + + @Column(name = "primary") + public Integer getPrimary() { + return primary; + } + + public void setPrimary(Integer primary) { + this.primary = primary; + } + + @Column(name = "junior") + public Integer getJunior() { + return junior; + } + + public void setJunior(Integer junior) { + this.junior = junior; + } + + @Column(name = "hospital") + public Integer getHospital() { + return hospital; + } + + public void setHospital(Integer hospital) { + this.hospital = hospital; + } + + @Column(name = "funeral") + public Integer getFuneral() { + return funeral; + } + + public void setFuneral(Integer funeral) { + this.funeral = funeral; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index f6e9855f0..b62c50cd5 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -31,12 +31,14 @@ import javax.validation.Valid; import com.fangjia.core.util.*; import com.fangjia.dal.*; import com.fangjia.dal.mongo.model.*; +import com.fangjia.dal.mongo.open.model.CommunityPoi; import com.fangjia.dal.seawater.dao.SeawaterDao; import com.fangjia.dal.seawater.model.Seawater; import com.fangjia.open.dto.*; import com.fangjia.service.district.*; import com.fangjia.service.mongo.fangjia.*; import com.fangjia.service.open.*; +import com.fangjia.service.open.impl.CommunityPoiServiceImpl; import com.fangjia.service.util.DistrictScoreUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -175,6 +177,7 @@ public class PropertyController { private SeawaterDao seawaterDao; private SeawaterService seawaterService; private SqmetreRentService sqmetreRentService; + private CommunityPoiServiceImpl communityPoiService; private FileDao fileDao = FileDao.getInstance(); private static final int DEFAULT_PAGE_SIZE = 20; @@ -1266,6 +1269,18 @@ public class PropertyController { modelFeaturesFto.put("buildYear", String.valueOf(buildYear)); } modelFeaturesFto.append("nearCommunity", nearCommunityDtos); + + // 模型特征新增周边数量 + CommunityPoi communityPoi = communityPoiService.getById(district.getId()); + if (communityPoi != null) { + modelFeaturesFto.put("subway", communityPoi.getSubway()); + modelFeaturesFto.put("traffic", communityPoi.getTraffic()); + modelFeaturesFto.put("bank", communityPoi.getBank()); + modelFeaturesFto.put("primary", communityPoi.getPrimary()); + modelFeaturesFto.put("hospital", communityPoi.getHospital()); + modelFeaturesFto.put("junior", communityPoi.getJunior()); + modelFeaturesFto.put("funeral", communityPoi.getFuneral()); + } districtPriceMap.put("modelFeatures", modelFeaturesFto); } mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); @@ -5601,4 +5616,12 @@ public class PropertyController { public void setRentDealPriceService(RentDealPriceService rentDealPriceService) { this.rentDealPriceService = rentDealPriceService; } + + public CommunityPoiServiceImpl getCommunityPoiService() { + return communityPoiService; + } + + public void setCommunityPoiService(CommunityPoiServiceImpl communityPoiService) { + this.communityPoiService = communityPoiService; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/open/CommunityPoiService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/open/CommunityPoiService.java new file mode 100644 index 000000000..c0eb458f1 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/open/CommunityPoiService.java @@ -0,0 +1,8 @@ +package com.fangjia.service.open; + +import com.fangjia.dal.mongo.open.model.CommunityPoi; + +public interface CommunityPoiService { + + CommunityPoi getById(String id); +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/open/impl/CommunityPoiServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/open/impl/CommunityPoiServiceImpl.java new file mode 100644 index 000000000..8ea0b05e1 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/open/impl/CommunityPoiServiceImpl.java @@ -0,0 +1,19 @@ +package com.fangjia.service.open.impl; + +import com.fangjia.dal.mongo.open.dao.CommunityPoiDao; +import com.fangjia.dal.mongo.open.model.CommunityPoi; +import com.fangjia.service.open.CommunityPoiService; + +public class CommunityPoiServiceImpl implements CommunityPoiService { + + private CommunityPoiDao communityPoiDao; + + @Override + public CommunityPoi getById(String id) { + return communityPoiDao.findById(id); + } + + public void setCommunityPoiDao(CommunityPoiDao communityPoiDao) { + this.communityPoiDao = communityPoiDao; + } +} From 40e923678a7c69dbf8fbec913bc30e5844dea2b8 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Wed, 18 May 2022 21:21:40 +0800 Subject: [PATCH 20/42] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=B4=E6=A0=8F?= =?UTF-8?q?=EF=BC=8C=E9=99=90=E5=88=B6=E5=8C=B9=E9=85=8D=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/service/address/processor/GeoProcessor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java index d0c3e88ac..4333ad444 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java @@ -5,6 +5,7 @@ import com.fangjia.core.util.HttpRequest; import com.fangjia.service.address.mode.Address; import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.apache.log4j.Logger; import java.util.Arrays; import java.util.HashMap; @@ -19,7 +20,7 @@ import java.util.Map; public class GeoProcessor extends AbstractAddressProcessor { private static final String KEY = "4ccfe3c898a9489884bd2bcb1ef6dcde"; - + private static final Logger logger = Logger.getLogger(GeoProcessor.class); List POI_LEVELS = Arrays.asList("村庄", "热点商圈", "兴趣点", "门牌号", "单元号", "道路交叉路口", "门牌号"); @Override @@ -36,6 +37,7 @@ public class GeoProcessor extends AbstractAddressProcessor { params.put("output", "json"); try { JSONObject response = request.getJsonContent("https://restapi.amap.com/v3/geocode/geo", params, "UTF-8"); + logger.info("高德API:" + response.toString()); if (response.getInt("status") == 1) { JSONArray geocodes = response.getJSONArray("geocodes"); if(geocodes.size() > 0){ From 0c4b469ea5c224f20108362e1844783ce6d8a037 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Wed, 18 May 2022 22:04:17 +0800 Subject: [PATCH 21/42] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=B4=E6=A0=8F?= =?UTF-8?q?=EF=BC=8C=E9=99=90=E5=88=B6=E5=8C=B9=E9=85=8D=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/service/address/processor/GeoProcessor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java index 4333ad444..0ffdbde20 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java @@ -25,7 +25,7 @@ public class GeoProcessor extends AbstractAddressProcessor { @Override public RepeatStatus process(Address address) { - + logger.info("Geo Start"); if (address.hasCoordinate()) { return RepeatStatus.NEXT; } @@ -78,6 +78,7 @@ public class GeoProcessor extends AbstractAddressProcessor { } } catch (Exception e) { + logger.error(e); e.printStackTrace(); } return RepeatStatus.NEXT; From b4d20ca24bdcd3225d42a65715ea8c4ce9c7a598 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Thu, 19 May 2022 08:47:41 +0800 Subject: [PATCH 22/42] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=B4=E6=A0=8F?= =?UTF-8?q?=EF=BC=8C=E9=99=90=E5=88=B6=E5=8C=B9=E9=85=8D=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../address/AddressParserServiceImpl.java | 21 ++++++++++++------- .../address/processor/GeoProcessor.java | 17 ++++++++------- .../address/processor/TooltipProcessor.java | 6 ++---- 3 files changed, 25 insertions(+), 19 deletions(-) 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 bd0be4380..6d9568d3d 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 @@ -898,7 +898,7 @@ public class AddressParserServiceImpl implements AddressParserService { if(name.length() == 2 && (name.equals(address.getOrgAddress()) || name.equals(address.getEffectiveAddress()))){ keywordScore = Math.max(keywordScore, namePriority); }else if(name.length() > 3 && (address.getOrgAddrePinYin().contains(namePinYin) || enhanceContains(address.getOrgAddress(), name))){ - double similar = AddressParserUtil.getSimilarityRatio(name, address.getEffectiveAddress()); + double similar = AddressParserUtil.getSimilarityRatio(name, address.getOrgAddress()); if(similar == 1){ keywordScore = Math.max(similar, keywordScore) * namePriority * 1.0001; }else if(similar > 0.1){ @@ -910,23 +910,28 @@ public class AddressParserServiceImpl implements AddressParserService { double matchLevelScore = 0; double similarityScore = 0; - if(metaData.getId().equals(address.getPolygonSeaweedId())){ + if (standardAddressScore > 0 && keywordScore > 0) { matchLevelScore = 0.9; - similarityScore = 0.05; - }else if (standardAddressScore > 0 && keywordScore > 0) { - matchLevelScore = 0.8; similarityScore = Math.max(standardAddressScore, keywordScore) * SIMILARITY_RATE; } else if (standardAddressScore > 0) { - matchLevelScore = 0.7; + matchLevelScore = 0.8; similarityScore = standardAddressScore * SIMILARITY_RATE; + }else if(metaData.getId().equals(address.getPolygonSeaweedId())){ + matchLevelScore = 0.7; + similarityScore = 0.05; } else if(keywordScore > 0 && streetScore > 0){ matchLevelScore = 0.6; similarityScore = Math.max(streetScore, keywordScore * 0.8) * SIMILARITY_RATE; } else if (keywordScore > 0) { - matchLevelScore = 0.6; + matchLevelScore = 0.5; similarityScore = keywordScore * SIMILARITY_RATE; } else if (fuzzyKeywordsScore > 0) { - matchLevelScore = 0.4; + if(address.hasCoordinate() && metaData.getLng() != null && GeoUtils.calculateDistance(address.getLng(), address.getLat(), + metaData.getLng(), metaData.getLat()) < 100){ + matchLevelScore = 0.6; + }else{ + matchLevelScore = 0.4; + } similarityScore = fuzzyKeywordsScore * SIMILARITY_RATE; } if (similarityScore > 0) { diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java index 0ffdbde20..e3ef9a3da 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/GeoProcessor.java @@ -25,13 +25,16 @@ public class GeoProcessor extends AbstractAddressProcessor { @Override public RepeatStatus process(Address address) { - logger.info("Geo Start"); if (address.hasCoordinate()) { return RepeatStatus.NEXT; } + String addr = address.getEffectiveAddress(); + if(addr == null || addr.length() < 3){ + addr = address.getOrgAddress(); + } HttpRequest request = new HttpRequest(); Map params = new HashMap(); - params.put("address", address.getOrgAddress()); + params.put("address", addr); params.put("key", KEY); params.put("city", address.getCity()); params.put("output", "json"); @@ -52,11 +55,11 @@ public class GeoProcessor extends AbstractAddressProcessor { } if(POI_LEVELS.contains(json.getString("level"))){ //对于门牌号级别的POI,formatted_address中包含|代表是推测出来的路号,重庆市巴南区凤林路|808号,|号楼 -// if("门牌号".equals(json.getString("level"))){ -// if(!(json.get("number") instanceof JSONArray) && json.getString("formatted_address").contains("|" + json.getString("number"))){ -// return RepeatStatus.NEXT; -// } -// } + if("门牌号".equals(json.getString("level"))){ + if(!(json.get("number") instanceof JSONArray) && json.getString("formatted_address").contains("|" + json.getString("number"))){ + return RepeatStatus.NEXT; + } + } String location = json.getString("location"); address.setLng(Double.valueOf(location.split(",")[0])); address.setLat(Double.valueOf(location.split(",")[1])); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/TooltipProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/TooltipProcessor.java index 4d3b65b14..3921fddf5 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/TooltipProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/TooltipProcessor.java @@ -42,12 +42,10 @@ public class TooltipProcessor extends AbstractAddressProcessor { if(matchFirst(AddressParserPatterns.STREET, tooltip) != null){ address.setTooltip(tooltip); address.setStreet(getStreet(tooltip)); - } else if(containsDistrictName(tooltip)){ - address.setTooltip(tooltip); - } else if(RegionData.isRegion(address.getCity(), tooltip)){ + }else if(RegionData.isRegion(address.getCity(), tooltip)){ address.setSuggestDistrict(tooltip); }else{ - address.addNosie(tooltip); + address.setTooltip(tooltip); } } } From 9bfe8cdb5fa24f8529e66d3bf3ca9ec5eec0145e Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 19 May 2022 10:14:12 +0800 Subject: [PATCH 23/42] update --- .../dal/seawater/dao/SeawaterDaoImpl.java | 18 +++++++++++++----- .../fangjia/dal/seawater/model/Seawater.java | 10 ++++++++++ .../open/controllers/AuctionController.java | 9 +++++++++ .../open/controllers/HouseController.java | 4 +++- .../com/fangjia/open/model/AuctionModel.java | 9 +++++++++ 5 files changed, 44 insertions(+), 6 deletions(-) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java index 203b6818b..bf43fa450 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java @@ -238,6 +238,14 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i if(source.containsKey("root")){ seawater.setRoot(source.getString("root")); } + + if(source.containsKey("estate_type")){ + seawater.setEstateType(source.getString("estate_type")); + } + + if(source.containsKey("build_type")){ + seawater.setBuildType(source.getString("build_type")); + } seawaterList.add(seawater); } return seawaterList; @@ -386,11 +394,11 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i } // 不展示删除 - JSONObject param = new JSONObject(); - param.put("status", 0); - JSONObject temp = new JSONObject(); - temp.put("term", param); - jsonList.add(temp); +// JSONObject param = new JSONObject(); +// param.put("status", 0); +// JSONObject temp = new JSONObject(); +// temp.put("term", param); +// jsonList.add(temp); query.put("must", jsonList); q.put("bool", query); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java index 48005c87b..910d805ea 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java @@ -60,6 +60,7 @@ public class Seawater implements SeawaterEntity { private Integer avgPrice; private String purpose; private String estateType; + private String buildType; @Id @Column(name = "_id") @@ -305,4 +306,13 @@ public class Seawater implements SeawaterEntity { public void setEstateType(String estateType) { this.estateType = estateType; } + + @Column(name = "build_type") + public String getBuildType() { + return buildType; + } + + public void setBuildType(String buildType) { + this.buildType = buildType; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java index 8d09d50b1..f2a10c491 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java @@ -203,6 +203,15 @@ public class AuctionController { if(StringUtils.isNotBlank(model.getName())){ params.add(new QueryParam("matchName", model.getName())); } + + Date startDate = null; + if(StringUtils.isNotBlank(model.getStartDate())){ + startDate = DateUtil.parseDate(model.getStartDate(),"yyyyMMdd"); + if(startDate != null){ + params.add(new QueryParam("startDate", startDate)); + } + } + List sortParams = new ArrayList(); sortParams.add(new SortParam("startDate", false)); List paimais = paiMaiService.findAll(params, sortParams, model.getLimit(), SEARCH_FIELDS); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java index bdf38d8b0..50b2700a2 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java @@ -421,7 +421,9 @@ public class HouseController { district = districtService.findDistrict(districtKey, "district"); }else{ district = districtService.findDistrictById(model.getId()); - districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName()); + if(district!=null){ + districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName()); + } } if(district == null){ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AuctionModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AuctionModel.java index a12e09a99..65092281a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AuctionModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AuctionModel.java @@ -18,6 +18,7 @@ public class AuctionModel extends FangjiaApiModel{ private Integer propertyType; private Integer status; private Integer limit = 10; + private String startDate; public String getId() { return id; @@ -130,4 +131,12 @@ public class AuctionModel extends FangjiaApiModel{ public void setName(String name) { this.name = name; } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } } From 7f6509a7c6345fb67aaff9e0a056a95c4a2feead Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Thu, 19 May 2022 10:18:53 +0800 Subject: [PATCH 24/42] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=B4=E6=A0=8F?= =?UTF-8?q?=EF=BC=8C=E9=99=90=E5=88=B6=E5=8C=B9=E9=85=8D=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/service/address/AddressParserServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 6d9568d3d..cba023bbd 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 @@ -1,12 +1,12 @@ package com.fangjia.service.address; import com.fangjia.core.RegionData; -import com.fangjia.core.util.*; +import com.fangjia.core.util.DataUtil; +import com.fangjia.core.util.GeoUtils; import com.fangjia.dal.QueryParam; import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.common.ServerAreaData; import com.fangjia.dal.mongo.fangjia.model.ServerArea; -import com.fangjia.dal.mongo.model.AmapPoi; import com.fangjia.dal.mongo.model.bkoff.HouseLoudong; import com.fangjia.dal.mongo.model.bkoff.Loudong; import com.fangjia.dal.seaweed.dao.SeaweedDao; @@ -16,17 +16,15 @@ import com.fangjia.service.address.processor.AddressDistrictProcessors; import com.fangjia.service.address.processor.AddressProcessors; import com.fangjia.service.api.AliyunService; import com.fangjia.service.bo.AliyunBo; -import com.fangjia.service.bo.MatchAddressScore; import com.fangjia.service.datastore.DistrictService; import com.fangjia.service.mongo.addrepo.AddressRepoService; import com.fangjia.service.mongo.bkoff.HouseLoudongService; import com.fangjia.service.mongo.bkoff.LoudongService; import com.google.common.base.Function; import com.google.common.collect.MapMaker; -import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.bson.types.ObjectId; + import java.util.*; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; From 2cb984bbd750b596848f16e608aa54b0f9e6a0d1 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Thu, 19 May 2022 11:09:04 +0800 Subject: [PATCH 25/42] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=B4=E6=A0=8F?= =?UTF-8?q?=EF=BC=8C=E9=99=90=E5=88=B6=E5=8C=B9=E9=85=8D=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/address/AddressParserServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 cba023bbd..15909a4c9 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 @@ -914,23 +914,23 @@ public class AddressParserServiceImpl implements AddressParserService { } else if (standardAddressScore > 0) { matchLevelScore = 0.8; similarityScore = standardAddressScore * SIMILARITY_RATE; - }else if(metaData.getId().equals(address.getPolygonSeaweedId())){ - matchLevelScore = 0.7; - similarityScore = 0.05; } else if(keywordScore > 0 && streetScore > 0){ - matchLevelScore = 0.6; + matchLevelScore = 0.7; similarityScore = Math.max(streetScore, keywordScore * 0.8) * SIMILARITY_RATE; } else if (keywordScore > 0) { - matchLevelScore = 0.5; + matchLevelScore = 0.6; similarityScore = keywordScore * SIMILARITY_RATE; } else if (fuzzyKeywordsScore > 0) { if(address.hasCoordinate() && metaData.getLng() != null && GeoUtils.calculateDistance(address.getLng(), address.getLat(), metaData.getLng(), metaData.getLat()) < 100){ - matchLevelScore = 0.6; + matchLevelScore = 0.7; }else{ matchLevelScore = 0.4; } similarityScore = fuzzyKeywordsScore * SIMILARITY_RATE; + }else if(metaData.getId().equals(address.getPolygonSeaweedId())){ + matchLevelScore = 0.4; + similarityScore = 0.05; } if (similarityScore > 0) { if(metaData.getBuildingType() != null){ From d546686df36d948879a086801e729b7638813071 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Thu, 19 May 2022 11:26:21 +0800 Subject: [PATCH 26/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A5=BC=E5=B1=82?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java | 5 +++++ .../java/com/fangjia/dal/seawater/model/Seawater.java | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java index e71226a4a..b2065ff21 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java @@ -203,6 +203,11 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i seawater.setFloor(source.getInt("floor")); }catch(Exception e){ seawater.setFloor(0); + } + try{ + seawater.setFloorInfo(source.getString("floor_info")); + }catch(Exception e){ + } if(source.containsKey("fitment")){ seawater.setFitment(source.getString("fitment")); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java index c761ba76a..27b4c75b3 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java @@ -48,6 +48,7 @@ public class Seawater implements SeawaterEntity { private Double area; private Integer height; private Integer floor; + private String floorInfo; private String fitment; private Integer room; private Integer hall; @@ -195,6 +196,15 @@ public class Seawater implements SeawaterEntity { this.floor = floor; } + @Column(name = "floorInfo") + public String getFloorInfo() { + return floorInfo; + } + + public void setFloorInfo(String floorInfo) { + this.floorInfo = floorInfo; + } + @Column(name = "fitment") public String getFitment() { return fitment; From dac6321ff66a8d9ae8aeec60c0e487d86c7db978 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Thu, 19 May 2022 14:34:19 +0800 Subject: [PATCH 27/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=B0=E5=80=BC?= =?UTF-8?q?=E5=91=A8=E5=BD=AA=E5=9D=87=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/open/controllers/PropertyController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index b62c50cd5..14563310d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -1259,9 +1259,15 @@ public class PropertyController { districtDto.append("buildYear", String.valueOf(buildYear)); } districtAnalyData = districtAnalyDataService.findByDistrictKey(new DistrictKey(d)); - if(districtAnalyData != null && districtAnalyData.getHalfYearMarkup() != null){ - districtDto.append("halfYearMarkup",DataUtil.roundDouble( districtAnalyData.getHalfYearMarkup() * 100 ,2)); + if(districtAnalyData != null){ + if (districtAnalyData.getHalfYearMarkup() != null) { + districtDto.append("halfYearMarkup", DataUtil.roundDouble(districtAnalyData.getHalfYearMarkup() * 100, 2)); + } + if (districtAnalyData.getAvgPrice() != null) { + districtDto.append("avgPrice", districtAnalyData.getAvgPrice()); + } } + nearCommunityDtos.add(districtDto); } Integer buildYear = districtService.getBuildYear(district); From a1d2a8139be45f0550e7b492cea4693056ac10f8 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Thu, 19 May 2022 14:57:45 +0800 Subject: [PATCH 28/42] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=B3=BB=E6=95=B0?= =?UTF-8?q?=E4=B8=8B=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/open/controllers/PropertyController.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 14563310d..a334cf730 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -1175,11 +1175,12 @@ public class PropertyController { districtPriceMap.put("district", district.getRegion()); districtPriceMap.put("name", district.getName()); long totalPrice = evaluation.getBigTotalPrice(); - if(CITY_CORRECTION_FACTOR.containsKey(district.getCity())){ - totalPrice = (long)(totalPrice * (1 - CITY_CORRECTION_FACTOR.get(district.getCity()))); - evaluation.setBigTotalPrice(totalPrice); - evaluation.setAvgPrice((int)(totalPrice/evaluation.getArea())); - } + // 取消系数下调 +// if(CITY_CORRECTION_FACTOR.containsKey(district.getCity())){ +// totalPrice = (long)(totalPrice * (1 - CITY_CORRECTION_FACTOR.get(district.getCity()))); +// evaluation.setBigTotalPrice(totalPrice); +// evaluation.setAvgPrice((int)(totalPrice/evaluation.getArea())); +// } districtPriceMap.put("totalPrice", evaluation.getBigTotalPrice()); districtPriceMap.put("unitPrice", evaluation.getAvgPrice()); List names = new ArrayList(); From b389e5b0c3ff21ea0b3bc10f48da3256474b98aa Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Thu, 19 May 2022 15:55:11 +0800 Subject: [PATCH 29/42] =?UTF-8?q?=E6=97=A0=E6=A0=B7=E6=9C=AC=E5=91=A8?= =?UTF-8?q?=E8=BE=B9=E4=BB=B7=E6=A0=BC=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/PropertyController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index a334cf730..96a414024 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -1222,7 +1222,7 @@ public class PropertyController { }else if(district.getLng() != null && district.getLng() > 0){ double lng = DataUtil.roundDouble(district.getLng() / 10000000000.0,6); double lat = DataUtil.roundDouble(district.getLat() / 10000000000.0, 6); - List districts = districtService.findNearestDistrict(district.getEstateType2(), lng, lat, 1000 * 3 , 4, null); + List districts = districtService.findNearestDistrict(district.getEstateType2(), lng, lat, 1000 * 3 , 6, null); if(districts.size() < 2){ evaluationService.remove(evaluation.getId()); mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价").markNoData()); @@ -1264,7 +1264,7 @@ public class PropertyController { if (districtAnalyData.getHalfYearMarkup() != null) { districtDto.append("halfYearMarkup", DataUtil.roundDouble(districtAnalyData.getHalfYearMarkup() * 100, 2)); } - if (districtAnalyData.getAvgPrice() != null) { + if (districtAnalyData.getAvgPrice() != null && minPrice <= districtAnalyData.getAvgPrice() && maxPrice >= districtAnalyData.getAvgPrice()) { districtDto.append("avgPrice", districtAnalyData.getAvgPrice()); } } From 9ceacdf9a95973ac3d6b97b409dba02ad9b2ead6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Thu, 19 May 2022 18:39:13 +0800 Subject: [PATCH 30/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E6=9C=AC?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/seawater/dao/SeawaterDaoImpl.java | 17 +++++++++++------ .../fangjia/open/filters/AnalyticsFilter.java | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java index 203b6818b..b9a97f6c3 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java @@ -67,12 +67,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i must.add(addTerms("district_name", alias)); must.add(addMatch("cat", "sell")); must.add(addRange("avg_price", minPrice, maxPrice)); - - JSONObject term = new JSONObject(); - JSONObject match = new JSONObject(); - match.put("p_date", 20210501); - term.put("match", match); - must.add(term); + must.add(addRangeGte("p_date", 20210501)); bool.put("must", must); query.put("bool", bool); @@ -168,6 +163,16 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i return term; } + private JSONObject addRangeGte(String name, Number min){ + JSONObject term = new JSONObject(); + JSONObject range = new JSONObject(); + JSONObject rangeValue = new JSONObject(); + rangeValue.put("gte", min); + range.put(name, rangeValue); + term.put("range", range); + return term; + } + private List wrapSeawater(List jsonList){ List seawaterList= new ArrayList(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/filters/AnalyticsFilter.java b/projects/fangjia-open/src/main/java/com/fangjia/open/filters/AnalyticsFilter.java index e16664d16..37805ef21 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/filters/AnalyticsFilter.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/filters/AnalyticsFilter.java @@ -75,8 +75,8 @@ public class AnalyticsFilter implements Filter { if ("1".equals(request.getParameter("__refresh_cache"))) { threadLocalData.put(ThreadLocalKey.DisableCache, "1"); } - createUID(request, response); - createSID(request, response); + //createUID(request, response); + //createSID(request, response); response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Allow-Methods", "*"); chain.doFilter(request, response); From 13a146e4c6962a6402fbe98db81fe4e46a0b68a2 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Mon, 23 May 2022 10:30:42 +0800 Subject: [PATCH 31/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E6=88=BF?= =?UTF-8?q?=E4=B8=80=E4=BB=B7=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/PropertyController.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 96a414024..eec63ef82 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -178,6 +178,7 @@ public class PropertyController { private SeawaterService seawaterService; private SqmetreRentService sqmetreRentService; private CommunityPoiServiceImpl communityPoiService; + private EvaluateFactorService evaluateFactorService; private FileDao fileDao = FileDao.getInstance(); private static final int DEFAULT_PAGE_SIZE = 20; @@ -1170,6 +1171,22 @@ public class PropertyController { mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价").markNoData()); return mav; } + // 调整面积不同面积价格 + DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district)); + int orgAvgPrice = 0; + if (districtStatBo != null) { + if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("别墅") && districtStatBo.getVillaDistrictStat() != null) { + orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvgPrice(); + } else if (districtStatBo.getDistrictStat() != null) { + orgAvgPrice = districtStatBo.getDistrictStat().getAvgPrice(); + } + } + if (evaluation != null && evaluation.getAvgPrice() != null && evaluation.getAvgPrice() > 0) { + int factorPrice = evaluation.getAvgPrice(); + int avgPrice = evaluateFactorService.recompose(district.getCity(), district.getRegion(), evaluation.getArea(), factorPrice, orgAvgPrice); + evaluation.setAvgPrice(avgPrice); + evaluation.setTotalPrice((int) (avgPrice * evaluation.getArea())); + } Map districtPriceMap = new LinkedHashMap(); districtPriceMap.put("city", district.getCity()); districtPriceMap.put("district", district.getRegion()); @@ -5631,4 +5648,8 @@ public class PropertyController { public void setCommunityPoiService(CommunityPoiServiceImpl communityPoiService) { this.communityPoiService = communityPoiService; } + + public void setEvaluateFactorService(EvaluateFactorService evaluateFactorService) { + this.evaluateFactorService = evaluateFactorService; + } } From 70338124281a42f14e4502e85de8b48351bc912a Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Mon, 23 May 2022 13:20:19 +0800 Subject: [PATCH 32/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E6=88=BF?= =?UTF-8?q?=E4=B8=80=E4=BB=B7=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/PropertyController.java | 115 ++++++++++++------ 1 file changed, 75 insertions(+), 40 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index eec63ef82..69c1eb263 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -397,7 +397,7 @@ public class PropertyController { /** * 利用百度API把GPS转换成Google经纬度 - * + * * @param lng * @param lat * @return @@ -419,7 +419,7 @@ public class PropertyController { /** * 利用算法模板把GPS转换成Google经纬度 - * + * * @param lng * @param lat * @return @@ -611,7 +611,7 @@ public class PropertyController { /** * 判断小区是否有经纬度 - * + * * @param district * @return */ @@ -622,7 +622,7 @@ public class PropertyController { /** * 调用匹配接口匹配小区 - * + * * @param city * @param address * @param region @@ -1000,6 +1000,32 @@ public class PropertyController { } } + // 调整面积不同面积价格 + try { + DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district)); + int orgAvgPrice = 0; + if (districtStatBo != null) { + if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("别墅") && districtStatBo.getVillaDistrictStat() != null) { + orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvgPrice(); + } else if (districtStatBo.getDistrictStat() != null) { + orgAvgPrice = districtStatBo.getDistrictStat().getAvgPrice(); + } + } + if (evaluation != null && evaluation.getAvgPrice() != null && evaluation.getAvgPrice() > 0) { + int factorPrice = evaluation.getAvgPrice(); + int avgPrice = evaluateFactorService.recompose(district.getCity(), district.getRegion(), evaluation.getArea(), factorPrice, orgAvgPrice); + Integer minPrice = (int)(evaluation.getAvgPrice() * 0.95); + Integer maxPrice = (int)(evaluation.getAvgPrice() * 1.05); + // 偏离度超过5%不进行调整 + if (minPrice <= avgPrice && avgPrice <= maxPrice) { + evaluation.setAvgPrice(avgPrice); + evaluation.setBigTotalPrice((long) (avgPrice * evaluation.getArea())); + } + } + } catch (Exception ex) { + + } + if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() != 0 && (cityPriceCredit == null || evaluation.getCredit() >= cityPriceCredit)) { Map districtPriceMap = new HashMap(); @@ -1172,20 +1198,29 @@ public class PropertyController { return mav; } // 调整面积不同面积价格 - DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district)); - int orgAvgPrice = 0; - if (districtStatBo != null) { - if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("别墅") && districtStatBo.getVillaDistrictStat() != null) { - orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvgPrice(); - } else if (districtStatBo.getDistrictStat() != null) { - orgAvgPrice = districtStatBo.getDistrictStat().getAvgPrice(); + try { + DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district)); + int orgAvgPrice = 0; + if (districtStatBo != null) { + if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("别墅") && districtStatBo.getVillaDistrictStat() != null) { + orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvgPrice(); + } else if (districtStatBo.getDistrictStat() != null) { + orgAvgPrice = districtStatBo.getDistrictStat().getAvgPrice(); + } } - } - if (evaluation != null && evaluation.getAvgPrice() != null && evaluation.getAvgPrice() > 0) { - int factorPrice = evaluation.getAvgPrice(); - int avgPrice = evaluateFactorService.recompose(district.getCity(), district.getRegion(), evaluation.getArea(), factorPrice, orgAvgPrice); - evaluation.setAvgPrice(avgPrice); - evaluation.setTotalPrice((int) (avgPrice * evaluation.getArea())); + if (evaluation != null && evaluation.getAvgPrice() != null && evaluation.getAvgPrice() > 0) { + int factorPrice = evaluation.getAvgPrice(); + int avgPrice = evaluateFactorService.recompose(district.getCity(), district.getRegion(), evaluation.getArea(), factorPrice, orgAvgPrice); + Integer minPrice = (int)(evaluation.getAvgPrice() * 0.95); + Integer maxPrice = (int)(evaluation.getAvgPrice() * 1.05); + // 偏离度超过5%不进行调整 + if (minPrice <= avgPrice && avgPrice <= maxPrice) { + evaluation.setAvgPrice(avgPrice); + evaluation.setBigTotalPrice((long) (avgPrice * evaluation.getArea())); + } + } + } catch (Exception ex) { + } Map districtPriceMap = new LinkedHashMap(); districtPriceMap.put("city", district.getCity()); @@ -1512,7 +1547,7 @@ public class PropertyController { return mav; } } - + /** * 四川锦程 定制接口 多建筑年代 * @param model @@ -1624,7 +1659,7 @@ public class PropertyController { districtPriceMap.put("buildYear", matcher3.group()); } } - + // 根据城市等 级设置D级可信度 ApiUserAuthority apiUserAuthority = apiUserAuthorityService @@ -2137,7 +2172,7 @@ public class PropertyController { /** * 小区租金查询接口 - * + * * @param model * @return */ @@ -2616,7 +2651,7 @@ public class PropertyController { /** * 批量获取小区的均价,均价走势数据 - * + * * @param request * @return */ @@ -2758,7 +2793,7 @@ public class PropertyController { /** * 批量获取小区的配套数据,最多12个小区 - * + * * @param request * @return */ @@ -2903,7 +2938,7 @@ public class PropertyController { /** * 获取JSON参数中的num参数值 - * + * * @param jo * @return */ @@ -2928,7 +2963,7 @@ public class PropertyController { /** * 获取JSON参数中的radius值 - * + * * @param jo * @return */ @@ -3736,7 +3771,7 @@ public class PropertyController { /** * 解析出关键字中的小区名 - * + * * @param keyword * @return */ @@ -3853,7 +3888,7 @@ public class PropertyController { /** * 小区统计分析接口 - * + * * @param model * @return */ @@ -3938,7 +3973,7 @@ public class PropertyController { /** * 小区交通接口 - * + * * @param model * @return */ @@ -3996,7 +4031,7 @@ public class PropertyController { /** * 小区周边接口 - * + * * @param model * @return */ @@ -4055,7 +4090,7 @@ public class PropertyController { /** * 相同小区相似户型房源挂牌量接口
* 获取该小区的满足指定相似条件的挂牌房源量 条件说明: 1.输入面积-5<=房源面积<=输入面积+5 2.上个月发布的房源 - * + * * @author yinjihuan * @date 2016年9月1日 * @param city @@ -4095,7 +4130,7 @@ public class PropertyController { /** * 周边小区相似户型挂牌量接口
* 获取该小区的满足指定相似条件的挂牌房源量 条件说明: 1.输入面积-5<=房源面积<=输入面积+5 2.上个月发布的房源 - * + * * @author yinjihuan * @date 2016年9月1日 * @param city @@ -4146,7 +4181,7 @@ public class PropertyController { /** * 小区周边一公里均价 - * + * * @author wenyan * @param model * @return @@ -4169,7 +4204,7 @@ public class PropertyController { /** * 相同小区相似户型租金范围查询接口 - * + * * @param model * @return */ @@ -4212,7 +4247,7 @@ public class PropertyController { /** * 周边小区相似户型租金范围查询接口 - * + * * @param model * @return */ @@ -4275,7 +4310,7 @@ public class PropertyController { /** * 室号查询接口 - * + * * @param model * @return */ @@ -4311,7 +4346,7 @@ public class PropertyController { /** * 楼栋楼层信息查询接口 - * + * * @param model * @return */ @@ -4336,7 +4371,7 @@ public class PropertyController { /** * 楼栋查询接口 - * + * * @param model * @return */ @@ -4381,7 +4416,7 @@ public class PropertyController { /** * 楼栋查询接口 - * + * * @param model * @return */ @@ -4834,7 +4869,7 @@ public class PropertyController { /** * 房产交易记录查询 - * + * * @param model * @return */ @@ -4894,7 +4929,7 @@ public class PropertyController { /** * 房产拍卖记录 - * + * * @param model * @return */ @@ -4955,7 +4990,7 @@ public class PropertyController { /** * 房产近期评估次数 - * + * * @param model * @return */ From 1648838af9abb97fb78a8402e7f8fd202e895c16 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Mon, 23 May 2022 13:30:18 +0800 Subject: [PATCH 33/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BD=AE=E4=BF=A1?= =?UTF-8?q?=E5=BA=A6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mongo/open/dao/CommunityBasePriceDao.java | 9 +++ .../dao/impl/CommunityBasePriceDaoImpl.java | 10 +++ .../mongo/open/model/CommunityBasePrice.java | 74 +++++++++++++++++++ .../open/controllers/PropertyController.java | 21 ++++-- .../open/CommunityBasePriceService.java | 9 +++ .../impl/CommunityBasePriceServiceImpl.java | 22 ++++++ 6 files changed, 139 insertions(+), 6 deletions(-) create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/CommunityBasePriceDao.java create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/impl/CommunityBasePriceDaoImpl.java create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityBasePrice.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/open/CommunityBasePriceService.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/open/impl/CommunityBasePriceServiceImpl.java diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/CommunityBasePriceDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/CommunityBasePriceDao.java new file mode 100644 index 000000000..8275f68f8 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/CommunityBasePriceDao.java @@ -0,0 +1,9 @@ +package com.fangjia.dal.mongo.open.dao; + +import com.fangjia.dal.MongoDao; +import com.fangjia.dal.mongo.open.model.CommunityBasePrice; +import com.fangjia.dal.mongo.open.model.CommunityPoi; + +public interface CommunityBasePriceDao extends MongoDao { + +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/impl/CommunityBasePriceDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/impl/CommunityBasePriceDaoImpl.java new file mode 100644 index 000000000..c89477b09 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/dao/impl/CommunityBasePriceDaoImpl.java @@ -0,0 +1,10 @@ +package com.fangjia.dal.mongo.open.dao.impl; + +import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.mongo.open.dao.CommunityBasePriceDao; +import com.fangjia.dal.mongo.open.dao.CommunityPoiDao; +import com.fangjia.dal.mongo.open.model.CommunityBasePrice; +import com.fangjia.dal.mongo.open.model.CommunityPoi; + +public class CommunityBasePriceDaoImpl extends MongoDaoImpl implements CommunityBasePriceDao { +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityBasePrice.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityBasePrice.java new file mode 100644 index 000000000..9321bd542 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/open/model/CommunityBasePrice.java @@ -0,0 +1,74 @@ +package com.fangjia.dal.mongo.open.model; + +import com.fangjia.dal.MongoEntity; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +/** + * 小区建行置信度信息 + * + * @author shenjian@fangjia.com + */ +@Entity +@Table(name = "business.community_base_price_gj") +public class CommunityBasePrice implements MongoEntity { + + private static final long serialVersionUID = -8010010773207622878L; + + private String id; + private String city; + private String region; + private String name; + private Double credit; + + @Id + @Column(name = "_id") + @Override + public String getId() { + return id; + } + + @Override + public void setId(String id) { + this.id = id; + } + + @Column(name = "city") + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + @Column(name = "region") + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + @Column(name = "name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Column(name = "credit") + public Double getCredit() { + return credit; + } + + public void setCredit(Double credit) { + this.credit = credit; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 69c1eb263..0a7df7866 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -31,6 +31,7 @@ import javax.validation.Valid; import com.fangjia.core.util.*; import com.fangjia.dal.*; import com.fangjia.dal.mongo.model.*; +import com.fangjia.dal.mongo.open.model.CommunityBasePrice; import com.fangjia.dal.mongo.open.model.CommunityPoi; import com.fangjia.dal.seawater.dao.SeawaterDao; import com.fangjia.dal.seawater.model.Seawater; @@ -177,7 +178,8 @@ public class PropertyController { private SeawaterDao seawaterDao; private SeawaterService seawaterService; private SqmetreRentService sqmetreRentService; - private CommunityPoiServiceImpl communityPoiService; + private CommunityPoiService communityPoiService; + private CommunityBasePriceService communityBasePriceService; private EvaluateFactorService evaluateFactorService; private FileDao fileDao = FileDao.getInstance(); @@ -1235,6 +1237,13 @@ public class PropertyController { // } districtPriceMap.put("totalPrice", evaluation.getBigTotalPrice()); districtPriceMap.put("unitPrice", evaluation.getAvgPrice()); + // 新增置信度 + CommunityBasePrice communityBasePrice = communityBasePriceService.getById(district.getId()); + if (communityBasePrice != null) { + districtPriceMap.put("credit", communityBasePrice.getCredit()); + } else { + districtPriceMap.put("credit", evaluation.getCredit()); + } List names = new ArrayList(); names.add(district.getName()); if(district.getAlias() != null){ @@ -5676,15 +5685,15 @@ public class PropertyController { this.rentDealPriceService = rentDealPriceService; } - public CommunityPoiServiceImpl getCommunityPoiService() { - return communityPoiService; - } - - public void setCommunityPoiService(CommunityPoiServiceImpl communityPoiService) { + public void setCommunityPoiService(CommunityPoiService communityPoiService) { this.communityPoiService = communityPoiService; } public void setEvaluateFactorService(EvaluateFactorService evaluateFactorService) { this.evaluateFactorService = evaluateFactorService; } + + public void setCommunityBasePriceService(CommunityBasePriceService communityBasePriceService) { + this.communityBasePriceService = communityBasePriceService; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/open/CommunityBasePriceService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/open/CommunityBasePriceService.java new file mode 100644 index 000000000..bc8c159de --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/open/CommunityBasePriceService.java @@ -0,0 +1,9 @@ +package com.fangjia.service.open; + +import com.fangjia.dal.mongo.open.model.CommunityBasePrice; +import com.fangjia.dal.mongo.open.model.CommunityPoi; + +public interface CommunityBasePriceService { + + CommunityBasePrice getById(String id); +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/open/impl/CommunityBasePriceServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/open/impl/CommunityBasePriceServiceImpl.java new file mode 100644 index 000000000..049e5ae16 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/open/impl/CommunityBasePriceServiceImpl.java @@ -0,0 +1,22 @@ +package com.fangjia.service.open.impl; + +import com.fangjia.dal.mongo.open.dao.CommunityBasePriceDao; +import com.fangjia.dal.mongo.open.dao.CommunityPoiDao; +import com.fangjia.dal.mongo.open.model.CommunityBasePrice; +import com.fangjia.dal.mongo.open.model.CommunityPoi; +import com.fangjia.service.open.CommunityBasePriceService; +import com.fangjia.service.open.CommunityPoiService; + +public class CommunityBasePriceServiceImpl implements CommunityBasePriceService { + + private CommunityBasePriceDao communityBasePriceDao; + + @Override + public CommunityBasePrice getById(String id) { + return communityBasePriceDao.findById(id); + } + + public void setCommunityBasePriceDao(CommunityBasePriceDao communityBasePriceDao) { + this.communityBasePriceDao = communityBasePriceDao; + } +} From a8cb3041a5b9cda7baa1c0b11485cd27a4355b49 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Tue, 24 May 2022 13:28:20 +0800 Subject: [PATCH 34/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=9D=87=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/open/controllers/PropertyController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 0a7df7866..33ab1b0f7 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -1280,6 +1280,18 @@ public class PropertyController { houseDtos.add(houseDto); } districtPriceMap.put("houses", houseDtos); + // 新增第三方均价 + try { + double dCredit = 0.61; + Map rMap = getLastEvaluationPrice(district, evaluation, dCredit); + if (null != rMap) { + if (rMap.containsKey("other_price")) { + districtPriceMap.put("other_price", rMap.get("other_price")); + } + } + } catch (Exception ex) { + + } }else if(district.getLng() != null && district.getLng() > 0){ double lng = DataUtil.roundDouble(district.getLng() / 10000000000.0,6); double lat = DataUtil.roundDouble(district.getLat() / 10000000000.0, 6); From 089971247554197ae89367d684f4061d58d6fe46 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Tue, 24 May 2022 13:53:42 +0800 Subject: [PATCH 35/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=9D=87=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/PropertyController.java | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 33ab1b0f7..fcf240ddc 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -396,6 +396,27 @@ public class PropertyController { put("5000", "five");// 五线 } }; + /** + * 第三方均价映射 + */ + private static final Map OTHER_PRICE_MAP = new HashMap() { + { + put("zhuge_price", "诸葛找房"); + put("anjuke_price", "安居客"); + put("fang_price", "房天下"); + put("lianjia_price", "链家"); + put("cityhouse_price", "禧泰数据"); + put("maitian_price", "麦田"); + put("ke_price", "贝壳"); + put("taofang_price", "淘房365"); + put("zhongyuan_price", "中原"); + put("tbs_price", "兔博士"); + put("qfang_price", "Q房"); + put("fangtan_price", "房探"); + put("fangduoduo_price", "房多多"); + put("wiwj_price", "我爱我家"); + } + }; /** * 利用百度API把GPS转换成Google经纬度 @@ -1255,6 +1276,8 @@ public class PropertyController { } Integer minPrice = (int)(evaluation.getAvgPrice() * 0.8); Integer maxPrice = (int)(evaluation.getAvgPrice() * 1.2); + Integer min10Price = (int)(evaluation.getAvgPrice() * 0.9); + Integer max10Price = (int)(evaluation.getAvgPrice() * 1.1); List houses = seawaterDao.findHouses(district.getCity(), district.getRegion(), names,minPrice, maxPrice, 20); if(houses.size() > 3){ districtPriceMap.put("calcType", 1); @@ -1286,7 +1309,18 @@ public class PropertyController { Map rMap = getLastEvaluationPrice(district, evaluation, dCredit); if (null != rMap) { if (rMap.containsKey("other_price")) { - districtPriceMap.put("other_price", rMap.get("other_price")); + Map otherPriceMap = (Map) rMap.get("other_price"); + Map priceResultMap = new HashMap(); + for (String key : otherPriceMap.keySet()) { + Integer price = otherPriceMap.get(key); + // 剔除偏差大于10的 + if (min10Price <= price && max10Price >= price) { + if (OTHER_PRICE_MAP.containsKey(key)) { + priceResultMap.put(OTHER_PRICE_MAP.get(key), price); + } + } + } + districtPriceMap.put("otherPrice", priceResultMap); } } } catch (Exception ex) { From 78b9a5a52220fe452d4e788a4db1718632b264c4 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Tue, 24 May 2022 14:30:02 +0800 Subject: [PATCH 36/42] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/PropertyController.java | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index fcf240ddc..89d72a2cc 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -1278,6 +1278,29 @@ public class PropertyController { Integer maxPrice = (int)(evaluation.getAvgPrice() * 1.2); Integer min10Price = (int)(evaluation.getAvgPrice() * 0.9); Integer max10Price = (int)(evaluation.getAvgPrice() * 1.1); + // 新增第三方均价 + try { + double dCredit = 0.61; + Map rMap = getLastEvaluationPrice(district, evaluation, dCredit); + if (null != rMap) { + if (rMap.containsKey("other_price")) { + Map otherPriceMap = (Map) rMap.get("other_price"); + Map priceResultMap = new HashMap(); + for (String key : otherPriceMap.keySet()) { + Integer price = otherPriceMap.get(key); + // 剔除偏差大于10的 + if (min10Price <= price && max10Price >= price) { + if (OTHER_PRICE_MAP.containsKey(key)) { + priceResultMap.put(OTHER_PRICE_MAP.get(key), price); + } + } + } + districtPriceMap.put("otherPrice", priceResultMap); + } + } + } catch (Exception ex) { + + } List houses = seawaterDao.findHouses(district.getCity(), district.getRegion(), names,minPrice, maxPrice, 20); if(houses.size() > 3){ districtPriceMap.put("calcType", 1); @@ -1303,29 +1326,6 @@ public class PropertyController { houseDtos.add(houseDto); } districtPriceMap.put("houses", houseDtos); - // 新增第三方均价 - try { - double dCredit = 0.61; - Map rMap = getLastEvaluationPrice(district, evaluation, dCredit); - if (null != rMap) { - if (rMap.containsKey("other_price")) { - Map otherPriceMap = (Map) rMap.get("other_price"); - Map priceResultMap = new HashMap(); - for (String key : otherPriceMap.keySet()) { - Integer price = otherPriceMap.get(key); - // 剔除偏差大于10的 - if (min10Price <= price && max10Price >= price) { - if (OTHER_PRICE_MAP.containsKey(key)) { - priceResultMap.put(OTHER_PRICE_MAP.get(key), price); - } - } - } - districtPriceMap.put("otherPrice", priceResultMap); - } - } - } catch (Exception ex) { - - } }else if(district.getLng() != null && district.getLng() > 0){ double lng = DataUtil.roundDouble(district.getLng() / 10000000000.0,6); double lat = DataUtil.roundDouble(district.getLat() / 10000000000.0, 6); From 420f0d046e41a9d1f45054ac942913e820e1bfee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Wed, 25 May 2022 10:04:42 +0800 Subject: [PATCH 37/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E6=9C=AC?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/service/address/processor/CityProcessor.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java index 130b7eea9..12adc0741 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java @@ -198,8 +198,6 @@ public class CityProcessor extends AbstractAddressProcessor { index += city.length(); if(province != null && (orgAddress.contains(province + city) || orgAddress.contains(ProvinceData.getDisplay(province) + city))){ weight.score += 2; - }else{ - weight.score += 1; } } Map> regionMap = RegionData.getAllRegions(city); From 4c7041b8b82e9ad2306a8ae23b253c713a780129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Wed, 25 May 2022 12:01:23 +0800 Subject: [PATCH 38/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E6=9C=AC?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/service/address/processor/CityProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java index 12adc0741..fce876ec2 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java @@ -221,7 +221,7 @@ public class CityProcessor extends AbstractAddressProcessor { List alias = regionMap.get(region); if(alias != null){ for(String alia : alias){ - if(StringUtils.isNotBlank(alia) && !alia.equals(region) && address.indexOf(alia, index) > -1 + if(StringUtils.isNotBlank(alia) && !alia.equals(region) && alia.length() > 2 && address.indexOf(alia, index) > -1 && (alia.endsWith("市")|(alia.endsWith("县")))){ if(city.equals(addr.getCity())){ weight.score += 10; From 8c8db4ad60348d2354977260e36f96d8d8f22901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Wed, 25 May 2022 19:51:25 +0800 Subject: [PATCH 39/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E6=9C=AC?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/service/address/processor/KeywordProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java index 547d8d2cb..b982d0b4f 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java @@ -22,7 +22,7 @@ public class KeywordProcessor extends AbstractAddressProcessor { static final List KEYWORDS_PATTERNS = Arrays.asList(Pattern.compile(".*[^一二三四五六七八九十\\d]{3,}号")); static final List KEYWORDS = Arrays.asList("居委会", "辖区", "街道办", "街道", "办事处", "村委", "管理区"); static final List NOISE_PATTERNS = Arrays.asList(Pattern.compile("^.*\\d+队"), Pattern.compile("^\\d+号院$")); - static final List INVALID_KEYWORD_PATTERN = Arrays.asList(Pattern.compile("^[一二三四五六七八九十甲乙丙丁戊己庚辛A-Z\\d]+[区期]$"), Pattern.compile("碧桂园"), Pattern.compile("住宅楼"), Pattern.compile("家属院")); + static final List INVALID_KEYWORD_PATTERN = Arrays.asList(Pattern.compile("^[一二三四五六七八九十甲乙丙丁戊己庚辛A-Z\\d]+[区期]$"), Pattern.compile("碧桂园"), Pattern.compile("住宅楼"), Pattern.compile("家属[区院]"), Pattern.compile("宿舍"), Pattern.compile("生活区"), Pattern.compile("公寓")); static final Pattern INVALID_PATTERN = Pattern.compile("^([-\\\\、])+$"); From e59a83be25d12fa229f3f7a9280e14eeb4147611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Wed, 25 May 2022 21:01:39 +0800 Subject: [PATCH 40/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E6=9C=AC?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/service/mongo/addrepo/AddressRepoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/addrepo/AddressRepoServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/addrepo/AddressRepoServiceImpl.java index 3965c9f00..c38f74a88 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/addrepo/AddressRepoServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/addrepo/AddressRepoServiceImpl.java @@ -240,7 +240,7 @@ public class AddressRepoServiceImpl implements AddressRepoService { } private boolean isAvailablePoi(AddressMatchMetaData data){ - if(data.getType() != null && data.getType().contains("路")){ + if(data.getType() != null && (data.getType().contains("路") || data.getType().contains("街道"))){ return false; } return true; From b8412c64bd155d130048d83a93c5d9cd13db5c3c Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 26 May 2022 15:37:40 +0800 Subject: [PATCH 41/42] update --- .../open/controllers/AuctionController.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java index f2a10c491..f24e78f40 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java @@ -208,7 +208,7 @@ public class AuctionController { if(StringUtils.isNotBlank(model.getStartDate())){ startDate = DateUtil.parseDate(model.getStartDate(),"yyyyMMdd"); if(startDate != null){ - params.add(new QueryParam("startDate", startDate)); + params.add(new QueryParam("startDate", QueryParam.GREATER_THAN_EQUAL_OPERATOR, startDate)); } } @@ -219,9 +219,15 @@ public class AuctionController { for(PaiMai paiMai : paimais){ Map map = standard(paiMai.getCity(), paiMai.getAddress()); if(map!=null){ - paiMai.setHouseNum((String) map.get("buildingNumber")); - paiMai.setUnitNum((String) map.get("unitNumber")); - paiMai.setRoomNum((String) map.get("roomNumber")); + if (map.containsKey("buildingNumber")) { + paiMai.setHouseNum((String) map.get("buildingNumber")); + } + if (map.containsKey("unitNumber")) { + paiMai.setUnitNum((String) map.get("unitNumber")); + } + if (map.containsKey("roomNumber")) { + paiMai.setRoomNum((String) map.get("roomNumber")); + } } } } From 96b0d198606ec0669e095b53bbc35a1dcbd49d70 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 26 May 2022 17:31:59 +0800 Subject: [PATCH 42/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/AuctionController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java index f24e78f40..b515c4593 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java @@ -31,7 +31,8 @@ public class AuctionController { private PaiMaiService paiMaiService; private DistrictNewPriceService districtNewPriceService; - private static final String[] SEARCH_FIELDS = new String[]{"marketAvgPrice", "startDate", "curPrice", "imgUrls", "id", "matchCity", "matchRegion", "matchName", "address", "marketTotalPrice", "startPrice", "curPrice", "predictPrice", "depositPrice", "area", "status", "url", "matchEstateType","type","count"}; + private static final String[] SEARCH_FIELDS = new String[]{"marketAvgPrice", "startDate", "curPrice", "imgUrls", "id", "matchCity", "matchRegion", "matchName", "address", "marketTotalPrice", "startPrice", "curPrice", "predictPrice", "depositPrice", "area", "status", "url", + "matchEstateType","type","count", "tradeAvgPrice", "evaluationPrice"}; public Object housesAction(AuctionModel model){ RestfulModelAndView mav = new RestfulModelAndView();