房源查询,先查自身

This commit is contained in:
majintao
2025-04-15 10:23:17 +08:00
parent 837b32092c
commit 9f5a53c49a
@@ -900,6 +900,13 @@ public class HouseController {
List<String> type2 = Arrays.asList("1", "0");
RestfulModelAndView mav = new RestfulModelAndView();
mav.setViewType("rest");
String city = model.getCity();
String region = model.getRegion();
String districtName = model.getName();
if (StringUtils.isNotBlank(districtName) && (StringUtils.isBlank(city) || StringUtils.isBlank(region))) {
mav.setModel(BasicModel.buildBadRequestModel("city,region,name为一组参数"));
return mav;
}
if (StringUtils.isNotBlank(model.getLocationType()) && !type3.contains(model.getLocationType())) {
mav.setModel(BasicModel.buildBadRequestModel("参数(locationType)有误"));
return mav;
@@ -984,22 +991,25 @@ public class HouseController {
cat = "shop_sell";
}
}
List<Seawater> houses = null;
List<Seawater> houses = new ArrayList<Seawater>();
List<Seawater> houseSelf = new ArrayList<Seawater>();
List<Seawater> houseAround =new ArrayList<Seawater>();
List<Seawater> houseList = new ArrayList<Seawater>();
// if (cat.contains("_")) {
// 商铺,写字楼有经纬度,直接查
SeawaterQuery query = new SeawaterQuery();
query.setLat(lat);
query.setLng(lng);
// 先用名字查自身的样本
query.setCityDisplay(city);
query.setRegion(region);
query.setDistrictName(districtName);
query.setCat(cat);
query.setRadius(model.getRadius());
query.setStartDate(model.getStartTime());
query.setEndDate(model.getEndTime());
if (model.getSize() != null && model.getSize() != 0) {
query.setStartArea(model.getSize() * 0.9);
query.setEndArea(model.getSize() * 1.1);
}
query.setCityDisplay(model.getCity());
Pager pager = new Pager();
pager.setStartRow(0);
if (model.getPageSize() != null && model.getPageSize() > 0) {
@@ -1009,8 +1019,28 @@ public class HouseController {
}
query.setPager(pager);
query.setTable("latest_seawater");
houses = seawaterDao.findSeawatersByQuery(query);
houseSelf = seawaterDao.findSeawatersByQuery(query);
houses.addAll(houseSelf);
// 如果自身样本数不够,再查周边
if (houseSelf != null && houseSelf.size() < pager.getPageSize()){
query.setRegion(null);
query.setDistrictName(null);
query.setLat(lat);
query.setLng(lng);
query.setRadius(model.getRadius());
houseAround = seawaterDao.findSeawatersByQuery(query);
houses.addAll(houseAround);
}
if (houses != null && !houses.isEmpty()) {
Set<String> seenIds = new HashSet<String>();
Iterator<Seawater> iterator = houses.iterator();
while (iterator.hasNext()) {
Seawater s = iterator.next();
if (!seenIds.add(s.getId())) {
// 如果已经存在,则从列表中移除
iterator.remove();
}
}
for (Seawater house : houses) {
Seawater seawater = new Seawater();
seawater.setId(house.getId());