/house/around 完善

This commit is contained in:
majintao
2024-12-03 17:45:54 +08:00
parent f68de68cee
commit 5cea2bc105
6 changed files with 131 additions and 57 deletions
@@ -7,6 +7,7 @@ import java.util.Map;
import com.fangjia.dal.FacetQuery;
import com.fangjia.dal.common.DistrictKey;
import com.fangjia.dal.datastore.model.RentHouse;
import com.fangjia.datastore.driver.FacetResult;
import com.fangjia.service.bo.HousePDSBo;
import com.fangjia.service.bo.HouseScorer;
@@ -470,4 +471,7 @@ public interface HouseService extends ModeService<String, HouseBo> {
HashMap<String, Object> findHouseStat(District districtKey, Integer avgPrice);
List<House> findNearestHasHouseByLocation(String city, Double lat, Double lng, String cat, int radiusMeters, int limit);
}
@@ -8,6 +8,7 @@ import com.fangjia.dal.common.FangjiaServerAreaContextHolder;
import com.fangjia.dal.common.ServerAreaData;
import com.fangjia.dal.datastore.dao.HouseDao;
import com.fangjia.dal.datastore.model.House;
import com.fangjia.dal.datastore.model.RentHouse;
import com.fangjia.dal.mongo.dao.UserHouseDao;
import com.fangjia.dal.mongo.fangjia.model.ServerArea;
import com.fangjia.dal.mongo.model.UserHouse;
@@ -2613,4 +2614,25 @@ public class HouseServiceImpl implements HouseService {
return value;
}
@Override
public List<House> 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<QueryParam> params = new ArrayList<QueryParam>();
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<SortParam> sortParams = Arrays.asList(new SortParam("latLng", true));
List<House> list = houseDao.findAllByParams(params, null, 0, limit);
return list;
}
}
@@ -210,5 +210,5 @@ public interface RentHouseService extends ModeService<String, RentHouseBo> {
// 用户中心发布房源接口 END
List<House> findNearestHasHouseByLocation(String city, Double lat, Double lng, String cat, int radiusMeters, int limit);
List<RentHouse> findNearestHasHouseByLocation(String city, Double lat, Double lng, String cat, int radiusMeters, int limit);
}
@@ -825,7 +825,7 @@ public class RentHouseServiceImpl implements RentHouseService {
}
@Override
public List<House> findNearestHasHouseByLocation(String city,Double lat, Double lng, String cat,int radiusMeters, int limit) {
public List<RentHouse> 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;
}
@@ -841,7 +841,7 @@ public class RentHouseServiceImpl implements RentHouseService {
// sdQuery.setDistance(String.valueOf(radiusMeters));
params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery));
List<SortParam> sortParams = Arrays.asList(new SortParam("latLng", true));
List<House> list = houseDao.findAllByParams(params, null, 0, limit);
List<RentHouse> list = rentHouseDao.findAllByParams(params, null, 0, limit);
return list;
}