diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AliasFangDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AliasFangDao.java new file mode 100644 index 000000000..004f28bb8 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AliasFangDao.java @@ -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 { + + List findFangByNameAndAlias(String city, String region, Set names); +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AliasFangDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AliasFangDaoImpl.java new file mode 100644 index 000000000..e5fe59202 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AliasFangDaoImpl.java @@ -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 implements AliasFangDao{ + + @Override + public List findFangByNameAndAlias(String city, String region, Set 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 objs = find(query, null, null, 0, Integer.MAX_VALUE); + return objs; + } +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AliasFang.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AliasFang.java new file mode 100644 index 000000000..c4027ecc3 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AliasFang.java @@ -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; + } +} 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 f22a692fa..b5efca725 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 @@ -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 PROPERTY_TYPES = new HashMap() { @@ -2536,7 +2527,7 @@ public class PropertyController { model.setMax(100); } - List districtNames = new ArrayList(); + Set districtNames = new HashSet(); if (null == district) { districtNames.add(model.getName()); } else { @@ -2567,6 +2558,23 @@ public class PropertyController { } } + // 将搜房中的别名与名称加入查询集合 + try { + List aliasFangs = aliasFangService.findFangByNameAndAlias(model.getCity(), model.getDistrict(), districtNames); + Set aliasSet = new HashSet(); + 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 dealPrices = new ArrayList(); // 将主名与映射别名查得成交加入 存在不能查出最新成交问题 @@ -2576,7 +2584,7 @@ public class PropertyController { // dealPrices.addAll(dealPricesTempList); // } // } - List dealPrices = findDealPricesByNames(model.getCity(), model.getDistrict(), districtNames, model.getMax() * 5, model); + List dealPrices = findDealPricesByNames(model.getCity(), model.getDistrict(), new ArrayList(districtNames), model.getMax() * 5, model); if (model.getSize() != null) { Collections.sort(dealPrices, new Comparator() { @Override @@ -6025,4 +6033,8 @@ public class PropertyController { public void setCommunityBasePriceService(CommunityBasePriceService communityBasePriceService) { this.communityBasePriceService = communityBasePriceService; } + + public void setAliasFangService(AliasFangService aliasFangService) { + this.aliasFangService = aliasFangService; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java index 68588d8e5..04e5d5de2 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java @@ -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; diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java index 189508ed8..dd625b469 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java @@ -2930,5 +2930,4 @@ public class DistrictServiceImpl implements DistrictService { params.add(new QueryParam("$sr", new SrQuery(query))); return districtDao.findAllByParams(params); } - } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/open/AliasFangService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/open/AliasFangService.java new file mode 100644 index 000000000..c3136da96 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/open/AliasFangService.java @@ -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 findFangByNameAndAlias(String city, String region, Set names); +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/open/AliasFangServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/open/AliasFangServiceImpl.java new file mode 100644 index 000000000..2437795cd --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/open/AliasFangServiceImpl.java @@ -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 findFangByNameAndAlias(String city, String region, Set names) { + return aliasFangDao.findFangByNameAndAlias(city, region, names); + } + + public void setAliasFangDao(AliasFangDao aliasFangDao) { + this.aliasFangDao = aliasFangDao; + } +}