Merge branch 'open_v2' into 'master'

房源逻辑修改

See merge request !749
This commit is contained in:
2023-11-15 16:21:52 +08:00
3 changed files with 153 additions and 54 deletions
@@ -349,9 +349,10 @@ public class HouseController {
}else if(StringUtils.isNotBlank(queryBean.getAddress())){
HttpRequest request = new HttpRequest();
JSONObject json = null;
String address = queryBean.getAddress().replace(" ","").replace("%","");
Map<String, String> params = new HashMap<String, String>();
params.put("city", queryBean.getCity());
params.put("address", queryBean.getAddress());
params.put("address", address);
params.put("category", "property");
//新匹配接口
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8");
@@ -906,17 +907,24 @@ public class HouseController {
Collateral collateral = collaterals.get(0);
List<Sample> samples = collateral.getSample();
UniversalDto dto = UniversalDto.newDto();
if(samples!= null && samples.size()>=2){
Sample minSample = samples.get(samples.size()-2);
Sample maxSample = samples.get(samples.size()-1);
dto.append("minUnitPrice", minSample.getUnitPrice());
dto.append("maxUnitPrice", maxSample.getUnitPrice());
if(null != collateral.getMaxPrice()){
dto.append("maxUnitPrice", collateral.getMaxPrice());
}
if(samples.size()>2){
dto.append("datas", samples.subList(0, samples.size()-2));
}else{
dto.append("datas", samples);
if(null != collateral.getMinPrice()){
dto.append("minUnitPrice", collateral.getMinPrice());
}
dto.append("datas", samples);
// if(samples!= null && samples.size()>=2){
// Sample minSample = samples.get(samples.size()-2);
// Sample maxSample = samples.get(samples.size()-1);
// dto.append("minUnitPrice", minSample.getUnitPrice());
// dto.append("maxUnitPrice", maxSample.getUnitPrice());
// }
// if(samples.size()>2){
// dto.append("datas", samples.subList(0, samples.size()-2));
// }else{
// dto.append("datas", samples);
// }
mav.setModel(BasicModel.buildOKModel().setResult(dto));
return mav;
@@ -18,6 +18,9 @@ public class Collateral {
@XStreamAlias("samples")
private List<Sample> sample;
private Integer maxPrice;
private Integer minPrice;
public String getCltNo() {
return cltNo;
}
@@ -33,4 +36,20 @@ public class Collateral {
public void setSample(List<Sample> sample) {
this.sample = sample;
}
public Integer getMaxPrice() {
return maxPrice;
}
public void setMaxPrice(Integer maxPrice) {
this.maxPrice = maxPrice;
}
public Integer getMinPrice() {
return minPrice;
}
public void setMinPrice(Integer minPrice) {
this.minPrice = minPrice;
}
}
@@ -79,12 +79,12 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{
List<Collateral> collateralList = new ArrayList<Collateral>();
for(CollateralSampleQueryBean queryBean : queryBeans){
Collateral collateral = new Collateral();
collateral.setCltNo(queryBean.getCltNo());
if(queryBean.getProperty() != null){
collateral.setSample(findSampleByQuery2(queryBean, max));
Collateral collateral = findSampleByQuery2(queryBean, max);
if(null != collateral){
collateralList.add(collateral);
}
}
collateralList.add(collateral);
}
return collateralList;
}
@@ -351,8 +351,49 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{
}
/**
* 添加样本的其他信息
* @param samples
*/
private void fillOthersSimpleInfo(List<SampleWrapper> samples){
for(SampleWrapper sample : samples){
District district = sample.getProperty();
Date finishBuildingDate = DateUtil.parseStringToDate(district.getFinishBuildingDate());
if(finishBuildingDate != null){
sample.setCompleteDate(DateUtil.formatByPattern(finishBuildingDate,"yyyy-MM-dd"));
}
if(district.getLat2() != null && district.getLat2() > 0){
sample.setLatitude(district.getLat2() / 10000000000d);
sample.setLongitude(district.getLng2()/ 10000000000d);
}
if(StringUtils.isNotBlank(district.getAddress()) && district.getAddress().length() < 80){
sample.setBuildingAddr(district.getAddress());
}
private List<Sample> findSampleByQuery2(CollateralSampleQueryBean queryBean, int max){
if("钢结构".equals(district.getBuildStructure())){
sample.setBuildStructureCode(10);
}else if("钢筋混凝土结构".equals(district.getBuildStructure())
|| "钢、钢筋混凝土结构".equals(district.getBuildStructure())){
sample.setBuildStructureCode(20);
}else if("混合结构".equals(district.getBuildStructure())){
sample.setBuildStructureCode(30);
}else if("砖木结构".equals(district.getBuildStructure())){
sample.setBuildStructureCode(40);
}
//之前是房源名称加“商住”,这块是将房源名称用小区名称填充
if(StringUtils.isNotBlank(sample.getBuildingName()) && sample.getBuildingName().contains("(商住)")){
if(!district.getName().contains("商住") && !district.getName().contains("商业")){
sample.setBuildingName(district.getName() + "(商住)");
}
}
}
}
private Collateral findSampleByQuery2(CollateralSampleQueryBean queryBean, int max){
SampleWrapper target = convertQueryBean2Sample(queryBean);
District district = queryBean.getProperty();
@@ -361,7 +402,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 = findBeijiaoShouSampleByDistrict(district.getCity(), district.getRegion(), district.getName(), district.getAlias(), district.getMasterDistrictNname(), district.getEstateType2(),queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat);
List<SampleWrapper> samples = findBeijiaoShouSampleByDistrict(district.getCity(), district.getRegion(), district.getName(), district.getAlias(), district.getMasterDistrictNname(), district.getEstateType2(),queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat, target.getStrctureArea(), 500);
sortForSample(samples, target);
SampleWrapper maxSample = null;
SampleWrapper minSample = null;
@@ -391,36 +432,41 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{
List<District> districts = districtService.findNearestDistrict(district, 3000, 50);
for(District d : districts){
d = districtService.findById(d.getId());
List<SampleWrapper> nearlySample = findBeijiaoShouSampleByDistrict(d.getCity(), d.getRegion(), d.getName(), district.getAlias(), district.getMasterDistrictNname(), district.getEstateType2(),queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat);
List<SampleWrapper> nearlySample = findBeijiaoShouSampleByDistrict(d.getCity(), d.getRegion(), d.getName(), district.getAlias(), district.getMasterDistrictNname(), district.getEstateType2(),queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat, target.getStrctureArea(), 20);
for(SampleWrapper sample : nearlySample){
sample.setProperty(d);
}
sortForSample(nearlySample, target);
for(SampleWrapper sample : nearlySample){
if(maxSample==null){
maxSample = new SampleWrapper();
maxSample = sample;
}else{
if(sample.getUnitPrice()>maxSample.getUnitPrice()){
maxSample = sample;
}
}
if(minSample==null){
minSample = new SampleWrapper();
minSample = sample;
}else{
if(sample.getUnitPrice()<minSample.getUnitPrice()){
minSample = sample;
}
}
}
// for(SampleWrapper sample : nearlySample){
// if(maxSample==null){
// maxSample = new SampleWrapper();
// maxSample = sample;
// }else{
// if(sample.getUnitPrice()>maxSample.getUnitPrice()){
// maxSample = sample;
// }
// }
//
// if(minSample==null){
// minSample = new SampleWrapper();
// minSample = sample;
// }else{
// if(sample.getUnitPrice()<minSample.getUnitPrice()){
// minSample = sample;
// }
// }
// }
if(querySamples.size() > max){
continue;
break;
}else{
querySamples.addAll(nearlySample);
if(nearlySample.size()>=2){
querySamples.addAll(nearlySample.subList(0,2));
}else{
querySamples.addAll(nearlySample);
}
}
}
}
@@ -435,8 +481,8 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{
priceUniqueKeys.add(wrapper.getUnitPrice());
selectedSample.add(querySamples.get(i));
}
fillOthersInfo(selectedSample);
List<Sample> sampleList = new ArrayList<Sample>(selectedSample.size()+2);
fillOthersSimpleInfo(selectedSample);
List<Sample> sampleList = new ArrayList<Sample>(selectedSample.size());
for(SampleWrapper sampleWrapper : selectedSample){
Sample sample = new Sample();
@@ -444,19 +490,26 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{
sampleList.add(sample);
}
Collateral collateral = new Collateral();
collateral.setCltNo(queryBean.getCltNo());
collateral.setSample(sampleList);
if(minSample!=null){
Sample sample = new Sample();
BeanUtils.copyProperties(minSample, sample);
sampleList.add(sample);
// Sample sample = new Sample();
// BeanUtils.copyProperties(minSample, sample);
// sampleList.add(sample);
collateral.setMinPrice(minSample.getUnitPrice());
}
if(maxSample!=null){
Sample sample = new Sample();
BeanUtils.copyProperties(maxSample, sample);
sampleList.add(sample);
// Sample sample = new Sample();
// BeanUtils.copyProperties(maxSample, sample);
// sampleList.add(sample);
collateral.setMaxPrice(maxSample.getUnitPrice());
}
return sampleList;
return collateral;
}
@@ -1030,7 +1083,7 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{
private List<SampleWrapper> findBeijiaoShouSampleByDistrict(String city, String region, String name, List<String> alias, String masterName, String distEstateType, String estateType, Date startDate, DistrictStat districtStat){
private List<SampleWrapper> findBeijiaoShouSampleByDistrict(String city, String region, String name, List<String> alias, String masterName, String distEstateType, String estateType, Date startDate, DistrictStat districtStat, Double area, Integer maxResultCount){
List<String> names = new ArrayList<String>();
names.add(ClientUtils.escapeQueryChars(name));
@@ -1051,11 +1104,25 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{
List<QueryParam> houseQuery = new ArrayList<QueryParam>();
houseQuery.add(new QueryParam("city", city ));
houseQuery.add(new QueryParam("region", region ));
// if(districtStat != null && districtStat.getAvgPrice() > 0){
// int avgPrice = districtStat.getAvgPrice();
// houseQuery.add(new QueryParam("avgPrice", QueryParam.GREATER_THAN_EQUAL_OPERATOR, (int)(avgPrice * 0.5 )));//0.85
// houseQuery.add(new QueryParam("avgPrice", QueryParam.LESS_THAN_EQUAL_OPERATOR, (int)(avgPrice * 1.5 )));//1.15
// }
Integer minPrice = null;
Integer maxPrice = null;
if(districtStat != null && districtStat.getAvgPrice() > 0){
int avgPrice = districtStat.getAvgPrice();
minPrice = (int)(avgPrice * 0.8 );
maxPrice = (int)(avgPrice * 1.2 );
houseQuery.add(new QueryParam("avgPrice", QueryParam.GREATER_THAN_EQUAL_OPERATOR, minPrice));//0.85
houseQuery.add(new QueryParam("avgPrice", QueryParam.LESS_THAN_EQUAL_OPERATOR, maxPrice));//1.15
}
if(area != null && area > 0){
double stepArea = DataUtil.getDoubleRound(2,area*0.2);
if(stepArea<15){
stepArea = 15;
}
houseQuery.add(new QueryParam("area", QueryParam.GREATER_THAN_EQUAL_OPERATOR, area - stepArea));
houseQuery.add(new QueryParam("area", QueryParam.LESS_THAN_EQUAL_OPERATOR, area + stepArea));
}
BooleanQuery nameQuery = new BooleanQuery();
int c = 0;
for (String n : names) {
@@ -1082,7 +1149,7 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{
List<SortParam> houseSortParams = new ArrayList<SortParam>();
houseSortParams.add(new SortParam("publishDate", false));
List<House> houses = houseDao.findAllByParams(houseQuery, houseSortParams, 0, 500, HOUSE_FIELDS);
List<House> houses = houseDao.findAllByParams(houseQuery, houseSortParams, 0, maxResultCount, HOUSE_FIELDS);
int height = 0;
int maxFloor = 0;
boolean allSampleHasHeight = true;
@@ -1102,7 +1169,12 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{
continue;
}
}
Integer avgPrice = (int)(house.getTotalPrice()/house.getArea());
if(minPrice !=null && (avgPrice<minPrice || avgPrice>maxPrice)){
continue;
}
house.setAvgPrice(avgPrice);
SampleWrapper sample = convertHouse2Sample(house);
if(isAvailableSample(sample)){
if(house.getUrl().contains("lianjia.com") || house.getUrl().contains("ke.com")){