增加查询样本量及均价

This commit is contained in:
majintao
2025-06-23 18:26:54 +08:00
parent ee73825b89
commit beef97f166
4 changed files with 227 additions and 12 deletions
@@ -1,6 +1,7 @@
package com.fangjia.dal.seawater.dao;
import java.util.List;
import java.util.Map;
import com.fangjia.dal.SeawaterQuery;
import com.fangjia.dal.seawater.model.Seawater;
@@ -10,21 +11,24 @@ import com.fangjia.dal.seawater.model.Seawater;
*/
public interface SeawaterDao extends com.fangjia.dal.SeawaterDao<Seawater> {
long findSeawatersCountFromEs(String category, String city, String region, String name, List<String> alias, List<String> regionAlias, Integer startDate, Integer endDate,
Integer room, String root,String table);
Seawater findByIdFromEs(String id,String table);
long findSeawatersCountFromEs(String category, String city, String region, String name, List<String> alias, List<String> regionAlias, Integer startDate, Integer endDate,
Integer room, String root, String table);
List<Seawater> findSeawatersFromEs(String category, String city, String region, String name, List<String> alias, List<String> regionAlias, Integer startDate, Integer endDate,
Double startArea, Double endArea, Integer startPrice, Integer endPrice, Integer room, String root, String sort, boolean order, int start, int limit , String table);
Seawater findByIdFromEs(String id, String table);
List<Seawater> findHouses(String city, String region, List<String> alias, Integer minPrice, Integer maxPrice, Integer limit);
List<Seawater> findSeawatersFromEs(String category, String city, String region, String name, List<String> alias, List<String> regionAlias, Integer startDate, Integer endDate,
Double startArea, Double endArea, Integer startPrice, Integer endPrice, Integer room, String root, String sort, boolean order, int start, int limit, String table);
List<Seawater> findSeawatersByQuery(SeawaterQuery query);
List<Seawater> findHouses(String city, String region, List<String> alias, Integer minPrice, Integer maxPrice, Integer limit);
long findSeawatersCountByQuery(SeawaterQuery query);
List<Seawater> findSeawatersByQuery(SeawaterQuery query);
void batchDeleteByParams(SeawaterQuery query);
long findSeawatersCountByQuery(SeawaterQuery query);
void batchUpdateEstateType(SeawaterQuery query);
void batchDeleteByParams(SeawaterQuery query);
void batchUpdateEstateType(SeawaterQuery query);
List<Map<String, Object>> samplesNum(String city, String region, String name, String cat,int size,
int startPDate, int endPDate, String sort, boolean order);
}
@@ -10,6 +10,8 @@ import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringUtils;
import org.sothis.core.util.Pager;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.*;
public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> implements SeawaterDao {
@@ -329,7 +331,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
} catch (Exception e) {
seawater.setpDate(0);
}
if (source.containsKey("publish_date")){
if (source.containsKey("publish_date")) {
seawater.setPublishDate(source.getString("publish_date"));
}
if (source.containsKey("url")) {
@@ -1035,4 +1037,169 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
return reqBody;
}
@Override
public List<Map<String, Object>> samplesNum(String city, String region, String name, String cat, int size,
int startPDate, int endPDate, String sort, boolean order) {
JSONObject jsonObject = getSamplesNum(city, region, name, cat, size, startPDate, endPDate, sort, order);
return parseMonthlyAggToList(jsonObject);
}
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);
// 1. 构建 query.bool.must 条件
List mustList = new ArrayList();
if (StringUtils.isNotBlank(city)) {
JSONObject term = new JSONObject();
term.put("city", city);
JSONObject termWrapper = new JSONObject();
termWrapper.put("term", term);
mustList.add(termWrapper);
}
if (StringUtils.isNotBlank(region)) {
JSONObject term = new JSONObject();
term.put("region", region);
JSONObject termWrapper = new JSONObject();
termWrapper.put("term", term);
mustList.add(termWrapper);
}
if (StringUtils.isNotBlank(name)) {
JSONObject term = new JSONObject();
term.put("district_name", name);
JSONObject termWrapper = new JSONObject();
termWrapper.put("term", term);
mustList.add(termWrapper);
}
if (StringUtils.isNotBlank(cat)) {
JSONObject term = new JSONObject();
term.put("cat", cat);
JSONObject termWrapper = new JSONObject();
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 查询
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)");
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 avgPrice = new JSONObject();
avgPrice.put("field", "avg_price");
JSONObject avgAgg = new JSONObject();
avgAgg.put("avg", avgPrice);
JSONObject subAggs = new JSONObject();
subAggs.put("avg_price", avgAgg);
JSONObject monthAgg = new JSONObject();
monthAgg.put("terms", terms);
monthAgg.put("aggs", subAggs);
JSONObject aggs = new JSONObject();
aggs.put("month_group", monthAgg);
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);
}
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 + "");
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;
} catch (HttpRequestException e) {
e.printStackTrace();
}
return null;
}
public static List<Map<String, Object>> parseMonthlyAggToList(JSONObject response) {
List<Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
if (response == null) {
return resultList;
}
JSONObject aggs = response.optJSONObject("aggregations");
if (aggs == null) {
return resultList;
}
JSONObject monthGroup = aggs.optJSONObject("month_group");
if (monthGroup == null) {
return resultList;
}
JSONArray buckets = monthGroup.optJSONArray("buckets");
if (buckets == null) {
return resultList;
}
for (int i = 0; i < buckets.size(); i++) {
JSONObject bucket = buckets.getJSONObject(i);
String monthKey = bucket.optString("key");
int docCount = bucket.optInt("doc_count", 0);
JSONObject avgPriceObj = bucket.optJSONObject("avg_price");
double avgPrice = 0;
if (avgPriceObj != null) {
avgPrice = avgPriceObj.optInt("value", 0);
}
Map<String, Object> map = new HashMap<String, Object>();
map.put("month", monthKey);
map.put("count", docCount);
map.put("avgPrice", avgPrice);
resultList.add(map);
}
return resultList;
}
}
@@ -1125,6 +1125,39 @@ public class HouseController {
return mav;
}
public Object samplesNumAction(final HouseSearchModel model){
RestfulModelAndView mav = new RestfulModelAndView();
mav.setViewType("rest");
// city region name 为必传参数
String city = model.getCity();
String region = model.getRegion();
String name = model.getName();
if (StringUtils.isBlank(city) || StringUtils.isBlank(region) || StringUtils.isBlank(name)) {
mav.setModel(BasicModel.buildBadRequestModel("城市(city),区域(region),小区名(name)为必填参数"));
return mav;
}
Integer periodCount = model.getPeriodCount();
if (periodCount == null || periodCount < 0) {
mav.setModel(BasicModel.buildBadRequestModel("参数(periodCount)有误"));
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM");
Calendar endCal = Calendar.getInstance(); // 当前月
int end = Integer.parseInt(sdf.format(endCal.getTime()));
end = end * 100 + 31;
Calendar startCal = (Calendar) endCal.clone();
startCal.add(Calendar.MONTH, -periodCount + 1); // 往前推 periodCount-1 个月,包含本月
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);
mav.setModel(maps);
return mav;
}
public Object rentAction(final HouseSearchModel model) {
RestfulModelAndView mav = new RestfulModelAndView();
mav.setViewType("rest");
@@ -31,6 +31,9 @@ public class HouseSearchModel extends SearchModel {
private Integer pageSize;
private Double price;
// ÆÚÊý
private Integer periodCount;
@Override
public QueryBean getQueryBean() {
HouseQueryBean queryBean = new HouseQueryBean();
@@ -219,4 +222,12 @@ public class HouseSearchModel extends SearchModel {
public void setPrice(Double price) {
this.price = price;
}
public Integer getPeriodCount() {
return periodCount;
}
public void setPeriodCount(Integer periodCount) {
this.periodCount = periodCount;
}
}