Merge branch 'open_v2' into 'master'

北交所新增接口

See merge request !746
This commit is contained in:
2023-11-08 16:17:56 +08:00
3 changed files with 270 additions and 25 deletions
@@ -184,7 +184,7 @@ public class DistrictFacilitys implements MongoEntity {
this.bus = bus;
}
@Column(name = "metro")
@Column(name = "subway")
public List<String> getMetro() {
return metro;
}
@@ -31,4 +31,11 @@ public interface CzbankSampleService {
List<ShopSample> findShopSample(ShopCollateralSampleQueryBean queryBean, int max);
}
/**
* 北交所小区房源样本查询
* @param queryBeans
* @param max
* @return
*/
List<Collateral> findSample2(List<CollateralSampleQueryBean> queryBeans, int max);
}
@@ -74,6 +74,22 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{
return collateralList;
}
@Override
public List<Collateral> findSample2(List<CollateralSampleQueryBean> queryBeans, int max) {
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));
}
collateralList.add(collateral);
}
return collateralList;
}
@Override
public List<ShopSample> findShopSample(ShopCollateralSampleQueryBean queryBean, int max) {
@@ -125,6 +141,7 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{
}
private List<SampleWrapper> findShopSampleByDistrict(String city, String region, String name, List<String> alias){
List<String> names = new ArrayList<String>();
@@ -208,7 +225,7 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{
sample.setProperty(d);
}
// scoreForSample(nearlySample, target);
sortForSample(samples, target);
sortForSample(nearlySample, target);
querySamples.addAll(nearlySample);
if(querySamples.size() > max){
break;
@@ -335,6 +352,116 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{
private List<Sample> findSampleByQuery2(CollateralSampleQueryBean queryBean, int max){
SampleWrapper target = convertQueryBean2Sample(queryBean);
District district = queryBean.getProperty();
DistrictStat districtStat = districtStatService.findOneDistrictStatsSort(district.getCity(), district.getRegion(), district.getName(), new Date());
if(districtStat == null){
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);
sortForSample(samples, target);
SampleWrapper maxSample = null;
SampleWrapper minSample = null;
for(SampleWrapper sample : samples){
sample.setProperty(queryBean.getProperty());
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;
}
}
}
querySamples.addAll(samples);
if(querySamples.size() < max){
district = districtService.findOneByKey(new DistrictKey(district.getCity(), district.getRegion(), district.getName()), "district");
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);
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;
}
}
}
if(querySamples.size() > max){
continue;
}else{
querySamples.addAll(nearlySample);
}
}
}
List<SampleWrapper> selectedSample = new ArrayList<SampleWrapper>(max);
Set<Integer> priceUniqueKeys = new HashSet<Integer>();
for(int i = 0; i < querySamples.size() && selectedSample.size() < max;i++){
SampleWrapper wrapper = querySamples.get(i);
if(priceUniqueKeys.contains(wrapper.getUnitPrice())){
continue;
}
priceUniqueKeys.add(wrapper.getUnitPrice());
selectedSample.add(querySamples.get(i));
}
fillOthersInfo(selectedSample);
List<Sample> sampleList = new ArrayList<Sample>(selectedSample.size()+2);
for(SampleWrapper sampleWrapper : selectedSample){
Sample sample = new Sample();
BeanUtils.copyProperties(sampleWrapper, sample);
sampleList.add(sample);
}
if(minSample!=null){
Sample sample = new Sample();
BeanUtils.copyProperties(minSample, sample);
sampleList.add(sample);
}
if(maxSample!=null){
Sample sample = new Sample();
BeanUtils.copyProperties(maxSample, sample);
sampleList.add(sample);
}
return sampleList;
}
/**
* 创建一个标准样本
* @param queryBean
@@ -490,6 +617,9 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{
if(samples.isEmpty()){
return samples;
}
if(null == targetSample.getStrctureArea()){
return samples;
}
// if(samples!=null && samples.size() < max){
// return samples;
// }
@@ -497,33 +627,11 @@ public class CzbankSampleServiceImpl implements CzbankSampleService{
public int compare(SampleWrapper o1, SampleWrapper o2) {
Double d1 = Math.abs(o1.getStrctureArea() - targetSample.getStrctureArea());
Double d2 = Math.abs(o2.getStrctureArea() - targetSample.getStrctureArea());
// return (int) (d1 - d2);
return d1.compareTo(d2);
}
});
List<Integer> prices = new ArrayList<Integer>();
// for(SampleWrapper sample : samples){
// if(!prices.contains(sample.getUnitPrice())){
// double min = targetSample.getStrctureArea() - 20;
// double max = targetSample.getStrctureArea() + 20;
// if(sample.getStrctureArea()>=min && sample.getStrctureArea()<=max){
// prices.add(sample.getUnitPrice());
// }
// }
// }
// if(prices.size()<10){
// prices.clear();
// for(SampleWrapper sample : samples){
// if(!prices.contains(sample.getUnitPrice())){
// prices.add(sample.getUnitPrice());
// if(prices.size()>=10){
// break;
// }
// }
// }
// }
for(SampleWrapper sample : samples){
if(!prices.contains(sample.getUnitPrice())){
prices.add(sample.getUnitPrice());
@@ -922,6 +1030,136 @@ 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){
List<String> names = new ArrayList<String>();
names.add(ClientUtils.escapeQueryChars(name));
if(alias != null){
for(String alia : alias){
if(StringUtils.isNotBlank(alia) && alia.length() >= 2 && !names.contains(alia)){
names.add(ClientUtils.escapeQueryChars(alia));
}
}
}
if(StringUtils.isNotBlank(masterName)){
names.add(ClientUtils.escapeQueryChars(masterName));
}
List<SampleWrapper> samples = new ArrayList<SampleWrapper>();
List<SampleWrapper> nolianjiaSamples = new ArrayList<SampleWrapper>();
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
// }
BooleanQuery nameQuery = new BooleanQuery();
int c = 0;
for (String n : names) {
if (StringUtils.isNotBlank(name)) {
if (name.indexOf("(") > -1 || name.indexOf(")") > -1 || name.indexOf("(") > -1 || name.indexOf(")") > -1
| name.indexOf("[") > -1 || name.indexOf("]") > -1 || name.indexOf("-") > -1 || name.indexOf("{") > -1
|| name.indexOf("}") > -1 || name.indexOf("{") > -1 || name.indexOf("}") > -1 || name.indexOf(":") > -1|| name.indexOf("\\") > -1) {
continue;
}
c++;
nameQuery.add(new TermQuery(new Term("district_name", n)), BooleanClause.Occur.SHOULD);
}
}
if(nameQuery.clauses().size()==0){
return samples;
}
BooleanQuery srQuery = new BooleanQuery();
srQuery.add(nameQuery, BooleanClause.Occur.MUST);
houseQuery.add(new QueryParam("$sr", new SrQuery(srQuery)));
if(startDate != null){
houseQuery.add(new QueryParam("publishDate", QueryParam.GREATER_THAN_OPERATOR, startDate));
}
List<SortParam> houseSortParams = new ArrayList<SortParam>();
houseSortParams.add(new SortParam("publishDate", false));
List<House> houses = houseDao.findAllByParams(houseQuery, houseSortParams, 0, 500, HOUSE_FIELDS);
int height = 0;
int maxFloor = 0;
boolean allSampleHasHeight = true;
for(House house : houses){
if(StringUtils.isNotBlank(estateType) && estateType.equals("01")){//01:普通住宅 02:别墅
if(StringUtils.isNotBlank(house.getEstateType()) && house.getEstateType().contains("别墅")){
continue;
}
if(isVilla(house.getArea(), house.getName(), house.getHeight(), house.getRoom())){
continue;
}
}else if(StringUtils.isNotBlank(estateType) && estateType.equals("02")){
if(house.getHeight()!=null && house.getHeight()>=10){
continue;
}
if(house.getFloor()!=null && house.getFloor()>=10){
continue;
}
}
SampleWrapper sample = convertHouse2Sample(house);
if(isAvailableSample(sample)){
if(house.getUrl().contains("lianjia.com") || house.getUrl().contains("ke.com")){
samples.add(sample);
}else{
nolianjiaSamples.add(sample);
}
}
//浙商测试特意添加
if(house.getDistrictName().equals("新泾三村") && house.getArea()>=35 && house.getArea()<=55){
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() + "(商住)");
}
}
}
// FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertFangjiaToOfficial(city, region);
if(samples.size()<10){
samples.addAll(nolianjiaSamples);
}
for(SampleWrapper sample : samples){
// if(sample.getAboveFloorAmount() == null){
// sample.setAboveFloorAmount(height);
// }
if(sample.getFloorNumber() == null){
if("01".equals(estateType)){
// System.out.println(sample.getAboveFloorAmount());
if(sample.getAboveFloorAmount()!=null){
sample.setFloorNumber((sample.getAboveFloorAmount()/2));
}
}else{
sample.setFloorNumber(1);
}
}
// if(fangjiaOfficialAreaMap != null){
// sample.setProvince(fangjiaOfficialAreaMap.getProvinceCode());
// sample.setCity(fangjiaOfficialAreaMap.getCityCode());
// sample.setDistrict(fangjiaOfficialAreaMap.getDistrictCode());
// }
}
return samples;
}
/**
* 根据小区名在楼栋库中查询最大的楼高
* @param city