From f58bebc6f2475fd1168f9809cfb93d946f61e5eb Mon Sep 17 00:00:00 2001 From: majintao Date: Fri, 29 Nov 2024 10:10:31 +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 --- .../open/controllers/HouseController.java | 8 +++- .../service/datastore/HouseService.java | 1 - .../service/datastore/HouseServiceImpl.java | 20 --------- .../service/datastore/RentHouseService.java | 3 ++ .../datastore/RentHouseServiceImpl.java | 43 +++++++++++++------ 5 files changed, 40 insertions(+), 35 deletions(-) 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 69313c28b..c56e7d63b 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 @@ -77,6 +77,8 @@ public class HouseController { private AddressParser addressParser; private HouseService houseService; + + private RentHouseService rentHouseService; private MenuService menuService; private NoHouseDistrictService noHouseDistrictService; private ApiUserService apiUserService; @@ -1010,7 +1012,7 @@ public class HouseController { } } } else { - List nearestHasHouseByLocation = houseService.findNearestHasHouseByLocation(model.getCity(), lat, lng, cat, model.getRadius(), 5); + List nearestHasHouseByLocation = rentHouseService.findNearestHasHouseByLocation(model.getCity(), lat, lng, cat, model.getRadius(), 5); if (nearestHasHouseByLocation != null && !nearestHasHouseByLocation.isEmpty()) { for (House house : nearestHasHouseByLocation) { Seawater seawater = new Seawater(); @@ -1869,4 +1871,8 @@ public class HouseController { public void setSeaweedService(SeaweedService seaweedService) { this.seaweedService = seaweedService; } + + public void setRentHouseService(RentHouseService rentHouseService) { + this.rentHouseService = rentHouseService; + } } 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 ac2e7863b..83f24d433 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 @@ -470,5 +470,4 @@ public interface HouseService extends ModeService { 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 c380ef49f..3093de0a2 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,25 +2612,5 @@ 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; - } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/RentHouseService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/RentHouseService.java index e12108154..9c7cbfbba 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/RentHouseService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/RentHouseService.java @@ -3,6 +3,7 @@ package com.fangjia.service.datastore; import java.util.List; import java.util.Map; +import com.fangjia.dal.datastore.model.House; import org.sothis.core.util.Pager; import com.fangjia.dal.FacetQueryResult; @@ -208,4 +209,6 @@ public interface RentHouseService extends ModeService { boolean refreshHouse(String houseId, int userId); // 用户中心发布房源接口 END + + 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/RentHouseServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/RentHouseServiceImpl.java index 647f14f8d..0b6f2a90e 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/RentHouseServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/RentHouseServiceImpl.java @@ -1,14 +1,10 @@ package com.fangjia.service.datastore; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; +import com.fangjia.dal.*; +import com.fangjia.dal.datastore.dao.HouseDao; +import com.fangjia.dal.datastore.model.House; import org.apache.commons.lang.StringUtils; import org.apache.lucene.search.Query; import org.sothis.core.util.CollectionUtils; @@ -16,11 +12,6 @@ import org.sothis.core.util.Pager; import com.fangjia.core.util.DateUtil; import com.fangjia.core.util.RandomUtil; -import com.fangjia.dal.FacetQuery; -import com.fangjia.dal.FacetQueryResult; -import com.fangjia.dal.QueryParam; -import com.fangjia.dal.SortParam; -import com.fangjia.dal.SrQuery; import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.common.FangjiaServerAreaContextHolder; import com.fangjia.dal.common.ServerAreaData; @@ -70,6 +61,8 @@ public class RentHouseServiceImpl implements RentHouseService { private UserHouseDao userHouseDao; private MetroDistanceService metroDistanceService; + private HouseDao houseDao; + public FacetQueryResult randomGainHouse(RentHouseQueryBean queryBean, int count) { long totalCount = this.findHouseCount(queryBean); int endCount = count * 100; @@ -831,6 +824,27 @@ public class RentHouseServiceImpl implements RentHouseService { return true; } + @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("latLng", true)); + List list = houseDao.findAllByParams(params, null, 0, limit); + return list; + } + public boolean refreshHouse(String houseId, int userId,String source) { List params = new ArrayList(2); params.add(new QueryParam("userId", userId)); @@ -899,4 +913,7 @@ public class RentHouseServiceImpl implements RentHouseService { this.metroDistanceService = metroDistanceService; } + public void setHouseDao(HouseDao houseDao) { + this.houseDao = houseDao; + } }