From 1ea2a612b2f52a682eaf846424d17dcde20e6e44 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Wed, 1 Mar 2023 17:34:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=9C=E8=8E=9E=E9=93=B6=E8=A1=8C-?= =?UTF-8?q?=E3=80=8B=E5=B8=82=E8=BE=96=E5=8C=BA=20=E5=BF=BD=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/PropertyController.java | 9 +++++++-- 1 file changed, 7 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 3080eefd4..55f16ae2b 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 @@ -955,8 +955,13 @@ public class PropertyController { District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "district"); if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); - return mav; + if(model.getDistrict().contains("市辖区")){ + district = districtService.findByNameAndAlias(model.getCity(), null, model.getName(), "district"); + } + if(district == null){ + mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + return mav; + } } model.setName(district.getName()); From 0b00f48f2b1474a565e9fd87de687e3632236786 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Wed, 1 Mar 2023 17:35:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B8=B8=E5=B7=9E=20=E5=95=86=E4=BD=8F=20?= =?UTF-8?q?=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/core/util/DataUtil.java | 2 +- .../datastore/CzbankSampleServiceImpl.java | 33 +++++++++++++++---- 2 files changed, 28 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 30aa6763d..81420c56c 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 @@ -1845,7 +1845,7 @@ public class DataUtil { // // System.out.println(FourUpSixInto("258.393", 2)); - String href = encodePicUrl("635240149c21300bba5184e1", "o", "upload"); + String href = encodePicUrl("636b1be2303c3f7093fdf7a5", "o", "upload"); String link = "http://static.fangjia.com/stc/fs/"+href; System.out.println(link); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java index 44c8e6315..c06682236 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java @@ -49,7 +49,7 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{ "totalPrice", "avgPrice", "area", "roomNumber", "fitment", "direction", "floor", "height", "tradeDate", "address"}; private static String[] HOUSE_FIELDS = new String[]{"city", "region", "districtName", "totalPrice", "avgPrice", - "area", "fitment", "direction", "floor", "height", "publishDate", "address"}; + "area", "fitment", "direction", "floor", "height", "publishDate", "address", "estateType"}; @@ -190,7 +190,7 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{ districtStat = districtStatService.findOneDistrictStatsSort(district.getCity(), district.getRegion(), district.getName(), DateUtil.add( new Date(), -7)); } List querySamples= new ArrayList(); - List samples = findSampleByDistrict(district.getCity(), district.getRegion(), district.getName(), district.getAlias(), district.getMasterDistrictNname(),queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat); + List samples = findSampleByDistrict(district.getCity(), district.getRegion(), district.getName(), district.getAlias(), district.getMasterDistrictNname(), district.getEstateType2(),queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat); scoreForSample(samples, target); for(SampleWrapper sample : samples){ sample.setProperty(queryBean.getProperty()); @@ -201,7 +201,7 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{ List districts = districtService.findNearestDistrict(district, 1000, 5); for(District d : districts){ d = districtService.findById(d.getId()); - List nearlySample = findSampleByDistrict(d.getCity(), d.getRegion(), d.getName(), district.getAlias(), district.getMasterDistrictNname(),queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat); + List nearlySample = findSampleByDistrict(d.getCity(), d.getRegion(), d.getName(), district.getAlias(), district.getMasterDistrictNname(), district.getEstateType2(),queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat); for(SampleWrapper sample : nearlySample){ sample.setProperty(d); } @@ -294,7 +294,15 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{ if(sample.getBuildingRemainLife() != null){ sample.setHouseHadUsed(sample.getHouseUseLimit() - sample.getBuildingRemainLife()); } - sample.setBuildingName(district.getName()); + + //之前是房源名称加“商住”,这块是将房源名称用小区名称填充 + if(StringUtils.isNotBlank(sample.getBuildingName()) && sample.getBuildingName().contains("(商住)")){ + if(!district.getName().contains("商住") && !district.getName().contains("商业")){ + sample.setBuildingName(district.getName() + "(商住)"); + } + + } + if("district".equals(district.getCategory())){ if(sample.getAboveFloorAmount() != null && sample.getAboveFloorAmount() > 6){ sample.setIsElevator(1); @@ -479,11 +487,12 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{ * @param region * @param name * @param alias - * @param estateType + * @param estateType 用户查询物业类型 * @param startDate + * @param distEstateType 小区物业类型 * @return */ - private List findSampleByDistrict(String city, String region, String name, List alias, String masterName, String estateType, Date startDate, DistrictStat districtStat){ + private List findSampleByDistrict(String city, String region, String name, List alias, String masterName, String distEstateType, String estateType, Date startDate, DistrictStat districtStat){ List names = new ArrayList(); names.add(ClientUtils.escapeQueryChars(name)); @@ -539,6 +548,7 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{ int maxFloor = 0; boolean allSampleHasHeight = true; for(House house : houses){ + SampleWrapper sample = convertHouse2Sample(house); if(isAvailableSample(sample)){ samples.add(sample); @@ -556,6 +566,17 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{ sample.setDoorNo("502"); sample.setBuildingNoName("56"); } + + if(StringUtils.isNotBlank(house.getEstateType())){ + if(house.getEstateType().contains("商业") || house.getEstateType().contains("商住") || house.getEstateType().contains("办公")){ + sample.setBuildingName(house.getDistrictName() +"(商住)"); + } + }else{ + if(StringUtils.isNotBlank(distEstateType) && (distEstateType.contains("商住") && (!name.contains("商住") || !name.contains("商业")) )){ + sample.setBuildingName(house.getDistrictName() + "(商住)"); + } + } + } List dealPriceQuery = new ArrayList(); dealPriceQuery.add(new QueryParam("city", city ));