Merge remote-tracking branch 'origin/master'

This commit is contained in:
沈健
2025-06-26 09:58:05 +08:00
4 changed files with 229 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,163 @@ 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. 构建 bool.must 查询条件
List<JSONObject> mustList = new ArrayList<JSONObject>();
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. 构建聚合 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);
// avg_price 子聚合
JSONObject avgPriceAgg = new JSONObject();
JSONObject avgJson = new JSONObject();
avgJson.put("field", "avg_price");
avgPriceAgg.put("avg", avgJson);
// 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", avgPriceAgg);
subAggs.put("moving_avg", movingAvgAgg);
// 整体聚合
JSONObject monthlyHistogramAgg = new JSONObject();
monthlyHistogramAgg.put("date_histogram", dateHistogram);
monthlyHistogramAgg.put("aggs", subAggs);
JSONObject aggs = new JSONObject();
aggs.put("monthly_histogram", monthlyHistogramAgg);
reqBody.put("aggs", aggs);
// 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((ES_USER + ":" + ES_PASSWORD).getBytes());
headers.put("Authorization", "Basic " + authenticationEncoding);
try {
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;
}
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("monthly_histogram");
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_as_string");
int docCount = bucket.optInt("doc_count", 0);
int avgPrice = bucket.getJSONObject("moving_avg").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,47 @@ 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 - 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);
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;
}
}