增加查询样本量及均价
This commit is contained in:
+49
-55
@@ -1044,13 +1044,13 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
|
||||
return parseMonthlyAggToList(jsonObject);
|
||||
}
|
||||
|
||||
public JSONObject getSamplesNum(String city, String region, String name, String cat, int size,
|
||||
int startPDate, int endPDate, String sort, boolean order) {
|
||||
public JSONObject getSamplesNum(String city, String region, String name, String cat,int size,
|
||||
int startPDate, int endPDate,String sort, boolean order) {
|
||||
JSONObject reqBody = new JSONObject();
|
||||
reqBody.put("size",0);
|
||||
reqBody.put("size", 0);
|
||||
|
||||
// 1. 构建 query.bool.must 条件
|
||||
List mustList = new ArrayList();
|
||||
// 1. 构建 bool.must 查询条件
|
||||
List<JSONObject> mustList = new ArrayList<JSONObject>();
|
||||
|
||||
if (StringUtils.isNotBlank(city)) {
|
||||
JSONObject term = new JSONObject();
|
||||
@@ -1082,84 +1082,82 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
|
||||
termWrapper.put("term", term);
|
||||
mustList.add(termWrapper);
|
||||
}
|
||||
|
||||
|
||||
// 日期范围条件
|
||||
JSONObject dateRange = new JSONObject();
|
||||
dateRange.put("gte", startPDate);
|
||||
dateRange.put("lte", endPDate);
|
||||
|
||||
JSONObject range = new JSONObject();
|
||||
range.put("p_date", dateRange);
|
||||
JSONObject rangeWrapper = new JSONObject();
|
||||
rangeWrapper.put("range", range);
|
||||
mustList.add(rangeWrapper);
|
||||
|
||||
// 封装 bool 查询
|
||||
// 组合 bool 查询
|
||||
JSONObject boolQuery = new JSONObject();
|
||||
boolQuery.put("must", mustList);
|
||||
JSONObject query = new JSONObject();
|
||||
query.put("bool", boolQuery);
|
||||
reqBody.put("query", query);
|
||||
|
||||
// 2. 聚合:按月份(p_date 的前6位)分组
|
||||
JSONObject script = new JSONObject();
|
||||
script.put("lang", "painless");
|
||||
script.put("source", "doc['p_date'].value.toString().substring(0,6)");
|
||||
// 2. 构建聚合 monthly_histogram
|
||||
JSONObject dateHistogram = new JSONObject();
|
||||
dateHistogram.put("field", "publish_date");
|
||||
dateHistogram.put("calendar_interval", "month");
|
||||
dateHistogram.put("format", "yyyy-MM");
|
||||
JSONObject orderJson = new JSONObject();
|
||||
orderJson.put("_key", "asc");
|
||||
dateHistogram.put("order",orderJson);
|
||||
|
||||
JSONObject terms = new JSONObject();
|
||||
terms.put("script", script);
|
||||
terms.put("size", size);
|
||||
JSONObject orderMap = new JSONObject();
|
||||
orderMap.put("_key", "asc");
|
||||
terms.put("order", orderMap);
|
||||
// avg_price 子聚合
|
||||
JSONObject avgPriceAgg = new JSONObject();
|
||||
JSONObject avgJson = new JSONObject();
|
||||
avgJson.put("field", "avg_price");
|
||||
avgPriceAgg.put("avg", avgJson);
|
||||
|
||||
// 子聚合:avg_price 平均值
|
||||
JSONObject avgPrice = new JSONObject();
|
||||
avgPrice.put("field", "avg_price");
|
||||
JSONObject avgAgg = new JSONObject();
|
||||
avgAgg.put("avg", avgPrice);
|
||||
// moving_avg 子聚合
|
||||
JSONObject movingFn = new JSONObject();
|
||||
movingFn.put("buckets_path", "avg_price");
|
||||
movingFn.put("window", 3);
|
||||
movingFn.put("script", "MovingFunctions.unweightedAvg(values)");
|
||||
|
||||
JSONObject movingAvgAgg = new JSONObject();
|
||||
movingAvgAgg.put("moving_fn", movingFn);
|
||||
|
||||
// 子聚合集合
|
||||
JSONObject subAggs = new JSONObject();
|
||||
subAggs.put("avg_price", avgAgg);
|
||||
subAggs.put("avg_price", avgPriceAgg);
|
||||
subAggs.put("moving_avg", movingAvgAgg);
|
||||
|
||||
JSONObject monthAgg = new JSONObject();
|
||||
monthAgg.put("terms", terms);
|
||||
monthAgg.put("aggs", subAggs);
|
||||
// 整体聚合
|
||||
JSONObject monthlyHistogramAgg = new JSONObject();
|
||||
monthlyHistogramAgg.put("date_histogram", dateHistogram);
|
||||
monthlyHistogramAgg.put("aggs", subAggs);
|
||||
|
||||
JSONObject aggs = new JSONObject();
|
||||
aggs.put("month_group", monthAgg);
|
||||
aggs.put("monthly_histogram", monthlyHistogramAgg);
|
||||
|
||||
reqBody.put("aggs", aggs);
|
||||
|
||||
// 3. 可选排序
|
||||
if (StringUtils.isNotBlank(sort)) {
|
||||
JSONObject jsonOrder = new JSONObject();
|
||||
jsonOrder.put("order", order ? "asc" : "desc");
|
||||
|
||||
JSONObject jsonSort = new JSONObject();
|
||||
jsonSort.put(sort, jsonOrder);
|
||||
|
||||
List sortList = new ArrayList();
|
||||
sortList.add(jsonSort);
|
||||
reqBody.put("sort", sortList);
|
||||
}
|
||||
// 3. 发送请求
|
||||
HttpRequest request = new HttpRequest();
|
||||
Map<String, String> headers = new HashMap<String, String>();
|
||||
headers.put("Content-Type", "application/json");
|
||||
Base64 token = new Base64();
|
||||
String authenticationEncoding = token.encodeAsString(new String("" + ES_USER + ":" + ES_PASSWORD + "").getBytes());
|
||||
headers.put("Authorization", "Basic " + authenticationEncoding + "");
|
||||
String authenticationEncoding = token.encodeAsString((ES_USER + ":" + ES_PASSWORD).getBytes());
|
||||
headers.put("Authorization", "Basic " + authenticationEncoding);
|
||||
|
||||
try {
|
||||
String response = request.postWithBody("http://es.fangjia.com:9200/" + "latest_seawater" + "/_search?rest_total_hits_as_int=true",
|
||||
reqBody, headers, "UTF-8");
|
||||
JSONObject json = JSONObject.fromObject(response);
|
||||
return json;
|
||||
String url = "http://es.fangjia.com:9200/latest_seawater/_search?rest_total_hits_as_int=true";
|
||||
String response = request.postWithBody(url, reqBody, headers, "UTF-8");
|
||||
return JSONObject.fromObject(response);
|
||||
} catch (HttpRequestException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public static List<Map<String, Object>> parseMonthlyAggToList(JSONObject response) {
|
||||
List<Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
|
||||
|
||||
@@ -1172,7 +1170,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
|
||||
return resultList;
|
||||
}
|
||||
|
||||
JSONObject monthGroup = aggs.optJSONObject("month_group");
|
||||
JSONObject monthGroup = aggs.optJSONObject("monthly_histogram");
|
||||
if (monthGroup == null) {
|
||||
return resultList;
|
||||
}
|
||||
@@ -1184,13 +1182,9 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
|
||||
|
||||
for (int i = 0; i < buckets.size(); i++) {
|
||||
JSONObject bucket = buckets.getJSONObject(i);
|
||||
String monthKey = bucket.optString("key");
|
||||
String monthKey = bucket.optString("key_as_string");
|
||||
int docCount = bucket.optInt("doc_count", 0);
|
||||
JSONObject avgPriceObj = bucket.optJSONObject("avg_price");
|
||||
double avgPrice = 0;
|
||||
if (avgPriceObj != null) {
|
||||
avgPrice = avgPriceObj.optInt("value", 0);
|
||||
}
|
||||
int avgPrice = bucket.getJSONObject("moving_avg").optInt("value",0);
|
||||
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
map.put("month", monthKey);
|
||||
|
||||
+7
-1
@@ -1147,12 +1147,18 @@ public class HouseController {
|
||||
end = end * 100 + 31;
|
||||
|
||||
Calendar startCal = (Calendar) endCal.clone();
|
||||
startCal.add(Calendar.MONTH, -periodCount + 1); // 往前推 periodCount-1 个月,包含本月
|
||||
startCal.add(Calendar.MONTH, -periodCount - 5); // 往前推 periodCount-5 个月,用于计算移动平均
|
||||
int start = Integer.parseInt(sdf.format(startCal.getTime()));
|
||||
start = start * 100 + 1;
|
||||
|
||||
String cat = model.getCat();
|
||||
List<Map<String, Object>> maps = seawaterDao.samplesNum(city, region, name, cat,periodCount, start, end, "", true);
|
||||
if (maps != null && maps.size() > 6) {
|
||||
maps = maps.subList(6, maps.size());
|
||||
} else {
|
||||
// 如果不足5个,直接清空或者根据需求处理
|
||||
maps = new ArrayList<Map<String,Object>>();
|
||||
}
|
||||
BasicModel basicModel = new BasicModel(200, "ok");
|
||||
basicModel.setResult(maps);
|
||||
mav.setModel(basicModel);
|
||||
|
||||
Reference in New Issue
Block a user