From 322a5a2d91bcad1f4f3aa30fe6a1d81991bdde29 Mon Sep 17 00:00:00 2001 From: majintao Date: Thu, 28 Nov 2024 15:42:44 +0800 Subject: [PATCH] =?UTF-8?q?/house/around=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/dal/SeawaterQuery.java | 30 ++++ .../dal/seawater/dao/SeawaterDaoImpl.java | 31 ++++ .../open/controllers/HouseController.java | 156 ++++++++++++------ .../datastore/DistrictServiceImpl.java | 18 +- .../service/datastore/HouseService.java | 2 + .../service/datastore/HouseServiceImpl.java | 20 +++ 6 files changed, 197 insertions(+), 60 deletions(-) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java index 66cc39114..4eac9a928 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java @@ -32,6 +32,12 @@ public class SeawaterQuery { private Pager pager; private String editEstateType; + private Double lat; + + private Double lng; + + private Integer radius; + public String getId() { return id; } @@ -239,4 +245,28 @@ public class SeawaterQuery { public void setEditEstateType(String editEstateType) { this.editEstateType = editEstateType; } + + public Double getLat() { + return lat; + } + + public void setLat(Double lat) { + this.lat = lat; + } + + public Double getLng() { + return lng; + } + + public void setLng(Double lng) { + this.lng = lng; + } + + public Integer getRadius() { + return radius; + } + + public void setRadius(Integer radius) { + this.radius = radius; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java index ab018c2ac..dd74c4224 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java @@ -554,6 +554,37 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i JSONObject q = new JSONObject(); JSONObject queryJson = new JSONObject(); List jsonList = new ArrayList(); + Double lat = query.getLat(); + Double lng = query.getLng(); + Integer radius = query.getRadius(); + if (lat != null && lng != null && radius != null) { + // 1. 设置地理位置参数 + JSONObject geoDistanceParam = new JSONObject(); + geoDistanceParam.put("lat", lat); + geoDistanceParam.put("lon", lng); + + // 2. 设置 geo_distance 过滤器,限制结果在指定的半径范围内 + JSONObject geoDistanceFilter = new JSONObject(); + JSONObject geoDistance = new JSONObject(); + geoDistance.put("distance", radius + "m"); // 半径设置为 3000km + geoDistance.put("location", geoDistanceParam); // 使用给定的经纬度 + geoDistanceFilter.put("geo_distance", geoDistance); + + // 3. 构建查询体 + reqBody.put("query", new JSONObject().put("filter", geoDistanceFilter)); + // 4. 添加按距离排序的部分 + JSONObject geoDistanceSort = new JSONObject(); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("order", "asc"); + jsonObject.put("location", geoDistanceParam); + jsonObject.put("unit", "m"); + jsonObject.put("distance_type", "arc"); + geoDistanceSort.put("_geo_distance", jsonObject); + // 5. 将排序部分添加到请求体 + List sortJsonList = new ArrayList(); + sortJsonList.add(geoDistanceSort); + reqBody.put("sort", sortJsonList); + } if(StringUtils.isNotBlank(query.getId())) { JSONObject param = new JSONObject(); param.put("_id", query.getId()); 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 c74fe5bd9..69313c28b 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 @@ -4,6 +4,7 @@ import com.fangjia.core.util.*; import com.fangjia.dal.FacetQuery; import com.fangjia.dal.FacetQueryResult; import com.fangjia.dal.QueryParam; +import com.fangjia.dal.SeawaterQuery; import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.common.ServerAreaData; import com.fangjia.dal.datastore.model.House; @@ -61,10 +62,12 @@ import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; import org.bson.types.ObjectId; import org.sothis.core.util.Closure; +import org.sothis.core.util.Pager; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; import java.io.IOException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -894,6 +897,22 @@ public class HouseController { public Object aroundAction(final HouseSearchModel model) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); + // 获取当前日期 + Calendar today = Calendar.getInstance(); + + // 复制一份当前日期,用于计算半年前的日期 + Calendar sixMonthsAgo = (Calendar) today.clone(); + + // 减去 6 个月 + sixMonthsAgo.add(Calendar.MONTH, -6); + + // 格式化日期为 yyyyMMdd + int todayInt = formatDate(today); + int sixMonthsAgoInt = formatDate(sixMonthsAgo); + model.setStartTime(sixMonthsAgoInt); + model.setEndTime(todayInt); + // 默认3000M内 + model.setRadius(3000); if (StringUtils.isBlank(model.getLocation())) { mav.setModel(BasicModel.buildBadRequestModel("location(经纬度)不能为空")); return mav; @@ -922,21 +941,14 @@ public class HouseController { category = "shop"; } - List seaweedList = seaweedService.findSeaweedByLocation(lat, lng, 3000, category); - if (seaweedList == null || seaweedList.isEmpty()) { - mav.setModel(BasicModel.buildBadRequestModel("没有找到相关的楼盘")); - return mav; - } String cat = "sell"; if ("1".equals(model.getHouseType())) { - if ("0".equals(model.getPropertyType())) { - cat = "rent"; - } if ("1".equals(model.getPropertyType())) { cat = "office_rent"; - } - if ("2".equals(model.getPropertyType())) { + } else if ("2".equals(model.getPropertyType())) { cat = "shop_rent"; + } else { + cat = "rent"; } } else { if ("1".equals(model.getPropertyType())) { @@ -946,54 +958,86 @@ public class HouseController { cat = "shop_sell"; } } - List houses; + List houses = null; List houseList = new ArrayList(); - for (Seaweed seaweed : seaweedList) { - + if (cat.contains("_")) { + // 商铺,写字楼有经纬度,直接查 + SeawaterQuery query = new SeawaterQuery(); + query.setLat(lat); + query.setLng(lng); + query.setCat(cat); + query.setRadius(model.getRadius()); + query.setStartDate(model.getStartTime()); + query.setEndDate(model.getEndTime()); if (model.getSize() != null && model.getSize() != 0) { - Double size = model.getSize(); - houses = seawaterDao.findSeawatersFromEs(cat, seaweed.getCity(), seaweed.getRegion(), seaweed.getName(), seaweed.getAlias(), null, - model.getStartTime(), model.getEndTime(), 0.9 * size, 1.1 * size, null, null, null, null, - "p_date", false, 0, 5, "latest_seawater"); - } else { - houses = seawaterDao.findSeawatersFromEs(cat, seaweed.getCity(), seaweed.getRegion(), seaweed.getName(), seaweed.getAlias(), null, - model.getStartTime(), model.getEndTime(), null, null, null, null, null, null, - "p_date", false, 0, 5, "latest_seawater"); + query.setStartArea(model.getSize() * 0.9); + query.setEndArea(model.getSize() * 1.1); } - for (Seawater house : houses) { - Seawater seawater = new Seawater(); - seawater.setCity(house.getCity()); - seawater.setDistrict(house.getRegion()); - seawater.setAddress(house.getAddress()); - seawater.setName(house.getDistrictName()); - seawater.setSize(house.getArea()); - seawater.setUnitPrice(house.getAvgPrice()); - seawater.setTotalPrice(house.getTotalPrice()); - seawater.setDirection(house.getDirection()); - seawater.setFloor(house.getFloor()); - seawater.setMaxFloor(house.getHeight()); - seawater.setRoom(house.getRoom()); - seawater.setHall(house.getHall()); - seawater.setToilet(house.getToilet()); - seawater.setDecoration(house.getFitment()); - if (house.getpDate() != null && house.getpDate() > 10000000) { - String numberStr = String.valueOf(house.getpDate()); - // 拆分字符串并格式化 - String year = numberStr.substring(0, 4); // 前四位是年份 - String month = numberStr.substring(4, 6); // 中间两位是月份 - String day = numberStr.substring(6, 8); // 最后两位是日期 - String formattedDate = year + "-" + month + "-" + day; - seawater.setPublishDate(formattedDate); + query.setCityDisplay(model.getCity()); + Pager pager = new Pager(); + pager.setStartRow(0); + pager.setPageSize(5); + query.setPager(pager); + query.setTable("latest_seawater"); + houses = seawaterDao.findSeawatersByQuery(query); + if (houses != null && !houses.isEmpty()) { + for (Seawater house : houses) { + Seawater seawater = new Seawater(); + seawater.setCity(house.getCity()); + seawater.setDistrict(house.getRegion()); + seawater.setAddress(house.getAddress()); + seawater.setName(house.getDistrictName()); + seawater.setSize(house.getArea()); + seawater.setUnitPrice(house.getAvgPrice()); + seawater.setTotalPrice(house.getTotalPrice()); + seawater.setDirection(house.getDirection()); + seawater.setFloor(house.getFloor()); + seawater.setMaxFloor(house.getHeight()); + seawater.setRoom(house.getRoom()); + seawater.setHall(house.getHall()); + seawater.setToilet(house.getToilet()); + seawater.setDecoration(house.getFitment()); + if (house.getpDate() != null && house.getpDate() > 10000000) { + String numberStr = String.valueOf(house.getpDate()); + // 拆分字符串并格式化 + String year = numberStr.substring(0, 4); // 前四位是年份 + String month = numberStr.substring(4, 6); // 中间两位是月份 + String day = numberStr.substring(6, 8); // 最后两位是日期 + String formattedDate = year + "-" + month + "-" + day; + seawater.setPublishDate(formattedDate); + } + houseList.add(seawater); } - if (houseList.size() > 4) { - break; - } - houseList.add(seawater); } - if (houseList.size() > 4) { - break; + } else { + List nearestHasHouseByLocation = houseService.findNearestHasHouseByLocation(model.getCity(), lat, lng, cat, model.getRadius(), 5); + if (nearestHasHouseByLocation != null && !nearestHasHouseByLocation.isEmpty()) { + for (House house : nearestHasHouseByLocation) { + Seawater seawater = new Seawater(); + seawater.setCity(house.getCity()); + seawater.setDistrict(house.getRegion()); + seawater.setAddress(house.getAddress()); + seawater.setName(house.getDistrictName()); + seawater.setSize(house.getArea()); + seawater.setUnitPrice(house.getAvgPrice()); + seawater.setTotalPrice(house.getTotalPrice()); + seawater.setDirection(house.getDirection()); + seawater.setFloor(house.getFloor()); + seawater.setMaxFloor(house.getHeight()); + seawater.setRoom(house.getRoom()); + seawater.setHall(house.getHall()); + seawater.setToilet(house.getToilet()); + seawater.setDecoration(house.getFitment()); + if (house.getPublishDate() != null) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + seawater.setPublishDate(sdf.format(house.getPublishDate())); + } + houseList.add(seawater); + } } } + + BasicModel basicModel = new BasicModel(200, "ok"); // 组装数据 basicModel.setResult(houseList); @@ -1002,6 +1046,16 @@ public class HouseController { return mav; } + // 格式化日期为 yyyyMMdd + private static int formatDate(Calendar calendar) { + int year = calendar.get(Calendar.YEAR); + int month = calendar.get(Calendar.MONTH) + 1; // 月份是从 0 开始的 + int day = calendar.get(Calendar.DAY_OF_MONTH); + + // 返回格式化后的整数 + return year * 10000 + month * 100 + day; + } + public Object caseAction(@Valid SampleQuery sampleQuery) { 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 a120b7d14..57420ac78 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 @@ -992,7 +992,7 @@ public class DistrictServiceImpl implements DistrictService { /** * 根据QueryBean查询符合条件的小区数量 - * + * * @param districtQueryBean * @return */ @@ -1067,7 +1067,7 @@ public class DistrictServiceImpl implements DistrictService { } /** - * + * * @param keyList * List * @param isNewDistrict @@ -1098,7 +1098,7 @@ public class DistrictServiceImpl implements DistrictService { */ /** - * + * * @param districtKey * DistrictKey * @param isNewDistrict @@ -1171,7 +1171,7 @@ public class DistrictServiceImpl implements DistrictService { /** * 查找小区 - * + * * @return */ private District doFindDistrict(DistrictKey key, String cat) { @@ -1203,7 +1203,7 @@ public class DistrictServiceImpl implements DistrictService { /** * 查找小区 - * + * * @param key * DistrictKey * @param isNewDistrict @@ -1252,7 +1252,7 @@ public class DistrictServiceImpl implements DistrictService { /* * (non-Javadoc) - * + * * @see com.fangjia.service.datastore.DistrictService#processDistrictInfo(java * .util.List, java.lang.String) */ @@ -2226,13 +2226,13 @@ public class DistrictServiceImpl implements DistrictService { /** * 查找周边最相似的楼盘 - * + * *
 	 * 相似条件
 	 * |建筑类型(estate_type2)相同或包含
 	 * |建筑年代最多差5年
 	 * 
- * + * * @param district * @param radiusMeters * @param limit @@ -2431,7 +2431,7 @@ public class DistrictServiceImpl implements DistrictService { /** * 查找最近的楼盘 - * + * * @param district * @param radiusMeters * @param limit diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseService.java index 1e35fc1e1..ac2e7863b 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseService.java @@ -469,4 +469,6 @@ public interface HouseService extends ModeService { long findHouseByYearMonth(String city, String region, String districtName, int yearMonth); HashMap findHouseStat(District districtKey, Integer avgPrice); + + List findNearestHasHouseByLocation(String city, Double lat,Double lng,String cat, int radiusMeters, int limit); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseServiceImpl.java index 3093de0a2..c380ef49f 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseServiceImpl.java @@ -2612,5 +2612,25 @@ public class HouseServiceImpl implements HouseService { CacheUtils.putValue(CacheUtils.CachePolicyEnum.MIDDLE, HouseServiceImpl.class, key, value); return value; } + @Override + public List findNearestHasHouseByLocation(String city,Double lat, Double lng, String cat,int radiusMeters, int limit) { + if (lat == null || lng == null || lat <= 0 ||lng <= 0) { + return Collections.EMPTY_LIST; + } + List params = new ArrayList(); +// params.add(new QueryParam("cat", cat)); + if (StringUtils.isNotBlank(city)){ + params.add(new QueryParam("city", city)); + } + SdQuery sdQuery = new SdQuery(); + sdQuery.setPoint(lat + "," + lng); + sdQuery.setField("lat_lng"); +// sdQuery.setDistance(String.valueOf((double) radiusMeters / 1000.0)); + sdQuery.setDistance(String.valueOf(radiusMeters)); + params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery)); +// List sortParams = Arrays.asList(new SortParam("distance", true)); + List list = houseDao.findAllByParams(params, null, 0, limit); + return list; + } }