常州 商住 标记
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
+27
-6
@@ -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<SampleWrapper> querySamples= new ArrayList<SampleWrapper>();
|
||||
List<SampleWrapper> samples = findSampleByDistrict(district.getCity(), district.getRegion(), district.getName(), district.getAlias(), district.getMasterDistrictNname(),queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat);
|
||||
List<SampleWrapper> 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<District> districts = districtService.findNearestDistrict(district, 1000, 5);
|
||||
for(District d : districts){
|
||||
d = districtService.findById(d.getId());
|
||||
List<SampleWrapper> nearlySample = findSampleByDistrict(d.getCity(), d.getRegion(), d.getName(), district.getAlias(), district.getMasterDistrictNname(),queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat);
|
||||
List<SampleWrapper> 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<SampleWrapper> findSampleByDistrict(String city, String region, String name, List<String> alias, String masterName, String estateType, Date startDate, DistrictStat districtStat){
|
||||
private List<SampleWrapper> findSampleByDistrict(String city, String region, String name, List<String> alias, String masterName, String distEstateType, String estateType, Date startDate, DistrictStat districtStat){
|
||||
|
||||
List<String> names = new ArrayList<String>();
|
||||
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<QueryParam> dealPriceQuery = new ArrayList<QueryParam>();
|
||||
dealPriceQuery.add(new QueryParam("city", city ));
|
||||
|
||||
Reference in New Issue
Block a user