/house/around 改成同一查询ES
This commit is contained in:
+9
-3
@@ -566,6 +566,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
|
||||
Double lat = query.getLat();
|
||||
Double lng = query.getLng();
|
||||
Integer radius = query.getRadius();
|
||||
JSONObject filter = new JSONObject();
|
||||
// 添加地理位置过滤器和排序
|
||||
if (lat != null && lng != null && radius != null) {
|
||||
// 1. 设置地理位置参数
|
||||
@@ -574,14 +575,16 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
|
||||
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);
|
||||
filter.put("geo_distance", geoDistance);
|
||||
|
||||
// 3. 构建查询体
|
||||
reqBody.put("query", new JSONObject().put("filter", geoDistanceFilter));
|
||||
// filter.put("filter", geoDistanceFilter);
|
||||
// jsonList.add(filter);
|
||||
// reqBody.put("query", filter);
|
||||
// 4. 添加按距离排序的部分
|
||||
JSONObject geoDistanceSort = new JSONObject();
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
@@ -745,6 +748,9 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
|
||||
}
|
||||
|
||||
queryJson.put("must", jsonList);
|
||||
ArrayList<JSONObject> filterList = new ArrayList<JSONObject>();
|
||||
filterList.add(filter);
|
||||
queryJson.put("filter", filterList);
|
||||
q.put("bool", queryJson);
|
||||
reqBody.put("query", q);
|
||||
//用户名:密码
|
||||
|
||||
Reference in New Issue
Block a user