diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java index 54f39bfaf..cc49ec68a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java @@ -900,6 +900,13 @@ public class HouseController { List 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 houses = null; + List houses = new ArrayList(); + List houseSelf = new ArrayList(); + List houseAround =new ArrayList(); List houseList = new ArrayList(); // 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) { @@ -1008,9 +1018,31 @@ public class HouseController { pager.setPageSize(5); } query.setPager(pager); + query.setSortField("p_date"); + query.setOrder(false); 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 seenIds = new HashSet(); + Iterator 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());