新增搜房别名支持

This commit is contained in:
沈健
2024-06-11 16:37:44 +08:00
parent b925bd17d4
commit 191f52dbfb
8 changed files with 201 additions and 15 deletions
@@ -0,0 +1,16 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDao;
import com.fangjia.dal.mongo.model.AliasFang;
import java.util.List;
import java.util.Set;
/**
* @author shenjian
* @since 2024/6/11
*/
public interface AliasFangDao extends MongoDao<AliasFang> {
List<AliasFang> findFangByNameAndAlias(String city, String region, Set<String> names);
}
@@ -0,0 +1,40 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDaoImpl;
import com.fangjia.dal.QueryParam;
import com.fangjia.dal.mongo.model.AliasFang;
import com.fangjia.dal.mongo.model.ConsumerAddress;
import com.mongodb.BasicDBList;
import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
import org.apache.commons.lang.StringUtils;
import org.sothis.core.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
public class AliasFangDaoImpl extends MongoDaoImpl<AliasFang> implements AliasFangDao{
@Override
public List<AliasFang> findFangByNameAndAlias(String city, String region, Set<String> names) {
DBObject query = new BasicDBObject();
if (StringUtils.isNotBlank(city)) {
query.put("city", city);
}
if (StringUtils.isNotBlank(region)) {
query.put("region", region);
}
// db.alias_fang.find({'city': 'ÖØÇì', 'region': 'Óå±±', $or: [{'name': 'ÖйúĦ'}, {'alias': 'ÖйúĦ'}]})
if(CollectionUtils.isNotEmpty(names)) {
BasicDBList dbList = new BasicDBList();
dbList.add(new BasicDBObject("name", new BasicDBObject("$in", names)));
dbList.add(new BasicDBObject("alias", new BasicDBObject("$in", names)));
query.put("$or", dbList);
}
List<AliasFang> objs = find(query, null, null, 0, Integer.MAX_VALUE);
return objs;
}
}
@@ -0,0 +1,68 @@
package com.fangjia.dal.mongo.model;
import com.fangjia.dal.MongoEntity;
import javax.persistence.*;
/**
* ËÑ·¿Ãû³ÆÓë±ðÃû¹ØÏµ
*/
@Entity
@Table(name = "business.alias_fang")
public class AliasFang implements MongoEntity {
private String id;
private String city;
private String region;
private String name;
private String alias;
@Override
@Id
@GeneratedValue
@Column(name = "_id", unique = true, nullable = false)
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 = "alias")
public String getAlias() {
return alias;
}
public void setAlias(String alias) {
this.alias = alias;
}
}
@@ -10,17 +10,7 @@ import java.net.URLEncoder;
import java.nio.charset.Charset;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -30,6 +20,7 @@ import javax.validation.Valid;
import com.fangjia.core.util.*;
import com.fangjia.dal.*;
import com.fangjia.dal.mongo.dao.AliasFangDao;
import com.fangjia.dal.mongo.model.*;
import com.fangjia.dal.mongo.open.model.CommunityBasePrice;
import com.fangjia.dal.mongo.open.model.CommunityPoi;
@@ -139,7 +130,6 @@ import com.mongodb.DBObject;
@Authority(role = Role.USER)
public class PropertyController {
private static final Logger LOGGER = LoggerFactory.getLogger(PropertyController.class);
private DistrictService districtService;
private AddressParser addressParser;
@@ -197,6 +187,7 @@ public class PropertyController {
private DistrictRoomSqmetreRentService districtRoomSqmetreRentService;
private RentDealPriceService rentDealPriceService;
private EvaluateRatioService evaluateRatioService;
private AliasFangService aliasFangService;
private static final int EVALUATE_SHOW_DETAIL = 1;
private static final Map<String, String> PROPERTY_TYPES = new HashMap<String, String>() {
@@ -2536,7 +2527,7 @@ public class PropertyController {
model.setMax(100);
}
List<String> districtNames = new ArrayList<String>();
Set<String> districtNames = new HashSet<String>();
if (null == district) {
districtNames.add(model.getName());
} else {
@@ -2567,6 +2558,23 @@ public class PropertyController {
}
}
// 将搜房中的别名与名称加入查询集合
try {
List<AliasFang> aliasFangs = aliasFangService.findFangByNameAndAlias(model.getCity(), model.getDistrict(), districtNames);
Set<String> aliasSet = new HashSet<String>();
for (AliasFang aliasFang : aliasFangs) {
if (StringUtils.isNotBlank(aliasFang.getName())) {
aliasSet.add(aliasFang.getName());
}
if (StringUtils.isNotBlank(aliasFang.getAlias())) {
aliasSet.add(aliasFang.getAlias());
}
}
districtNames.addAll(aliasSet);
} catch (Exception ex) {
ex.printStackTrace();
}
// List<DealPrice> dealPrices = new ArrayList<DealPrice>();
// 将主名与映射别名查得成交加入 存在不能查出最新成交问题
@@ -2576,7 +2584,7 @@ public class PropertyController {
// dealPrices.addAll(dealPricesTempList);
// }
// }
List<DealPrice> dealPrices = findDealPricesByNames(model.getCity(), model.getDistrict(), districtNames, model.getMax() * 5, model);
List<DealPrice> dealPrices = findDealPricesByNames(model.getCity(), model.getDistrict(), new ArrayList<String>(districtNames), model.getMax() * 5, model);
if (model.getSize() != null) {
Collections.sort(dealPrices, new Comparator<DealPrice>() {
@Override
@@ -6025,4 +6033,8 @@ public class PropertyController {
public void setCommunityBasePriceService(CommunityBasePriceService communityBasePriceService) {
this.communityBasePriceService = communityBasePriceService;
}
public void setAliasFangService(AliasFangService aliasFangService) {
this.aliasFangService = aliasFangService;
}
}
@@ -6,6 +6,7 @@ import com.fangjia.dal.SdQuery;
import com.fangjia.dal.SortParam;
import com.fangjia.dal.common.DistrictKey;
import com.fangjia.dal.mongo.model.AgencyDistrictTradeRank;
import com.fangjia.dal.mongo.model.AliasFang;
import com.fangjia.dal.mongo.model.DistrictFacilitys;
import com.fangjia.dal.seaweed.model.District;
import com.fangjia.service.bo.DistrictInfo;
@@ -2930,5 +2930,4 @@ public class DistrictServiceImpl implements DistrictService {
params.add(new QueryParam("$sr", new SrQuery(query)));
return districtDao.findAllByParams(params);
}
}
@@ -0,0 +1,23 @@
package com.fangjia.service.open;
import com.fangjia.dal.mongo.model.AliasFang;
import java.util.List;
import java.util.Set;
/**
* @author shenjian
* @since 2024/6/11
*/
public interface AliasFangService {
/**
* 查询搜房别名与名称关系
*
* @param city
* @param region
* @param names
* @return
*/
List<AliasFang> findFangByNameAndAlias(String city, String region, Set<String> names);
}
@@ -0,0 +1,27 @@
package com.fangjia.service.open;
import com.fangjia.dal.QueryParam;
import com.fangjia.dal.mongo.dao.AliasFangDao;
import com.fangjia.dal.mongo.model.AliasFang;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
/**
* @author shenjian
* @since 2024/6/11
*/
public class AliasFangServiceImpl implements AliasFangService{
private AliasFangDao aliasFangDao;
@Override
public List<AliasFang> findFangByNameAndAlias(String city, String region, Set<String> names) {
return aliasFangDao.findFangByNameAndAlias(city, region, names);
}
public void setAliasFangDao(AliasFangDao aliasFangDao) {
this.aliasFangDao = aliasFangDao;
}
}