新增搜房别名支持

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
@@ -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;
}
}