From beef97f166983d4c3a45c639b03e974d1a08dc23 Mon Sep 17 00:00:00 2001 From: majintao Date: Mon, 23 Jun 2025 18:26:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A0=B7=E6=9C=AC=E9=87=8F=E5=8F=8A=E5=9D=87=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/dal/seawater/dao/SeawaterDao.java | 26 +-- .../dal/seawater/dao/SeawaterDaoImpl.java | 169 +++++++++++++++++- .../open/controllers/HouseController.java | 33 ++++ .../fangjia/open/model/HouseSearchModel.java | 11 ++ 4 files changed, 227 insertions(+), 12 deletions(-) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java index ecb61ff6f..58d5b0b40 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java @@ -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 { - long findSeawatersCountFromEs(String category, String city, String region, String name, List alias, List 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 alias, List regionAlias, Integer startDate, Integer endDate, + Integer room, String root, String table); - List findSeawatersFromEs(String category, String city, String region, String name, List alias, List 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 findHouses(String city, String region, List alias, Integer minPrice, Integer maxPrice, Integer limit); + List findSeawatersFromEs(String category, String city, String region, String name, List alias, List 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 findSeawatersByQuery(SeawaterQuery query); + List findHouses(String city, String region, List alias, Integer minPrice, Integer maxPrice, Integer limit); - long findSeawatersCountByQuery(SeawaterQuery query); + List findSeawatersByQuery(SeawaterQuery query); - void batchDeleteByParams(SeawaterQuery query); + long findSeawatersCountByQuery(SeawaterQuery query); - void batchUpdateEstateType(SeawaterQuery query); + void batchDeleteByParams(SeawaterQuery query); + + void batchUpdateEstateType(SeawaterQuery query); + + List> samplesNum(String city, String region, String name, String cat,int size, + int startPDate, int endPDate, String sort, boolean order); } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java index b2724fdf4..dd02c43b2 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java @@ -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 implements SeawaterDao { @@ -329,7 +331,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl 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 i return reqBody; } + @Override + public List> 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 headers = new HashMap(); + 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> parseMonthlyAggToList(JSONObject response) { + List> resultList = new ArrayList>(); + + 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 map = new HashMap(); + map.put("month", monthKey); + map.put("count", docCount); + map.put("avgPrice", avgPrice); + + resultList.add(map); + } + + return resultList; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java index cb41460ae..3b357130e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java @@ -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> 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"); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java index dc5b5eae0..ef1349ad0 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java @@ -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; + } } From 36a27ec0f1019c41a06a6ba290d127f1057785f5 Mon Sep 17 00:00:00 2001 From: majintao Date: Mon, 23 Jun 2025 18:41:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A0=B7=E6=9C=AC=E9=87=8F=E5=8F=8A=E5=9D=87=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/HouseController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java index 3b357130e..86d6996e4 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java @@ -1153,7 +1153,9 @@ public class HouseController { String cat = model.getCat(); List> maps = seawaterDao.samplesNum(city, region, name, cat,periodCount, start, end, "", true); - mav.setModel(maps); + BasicModel basicModel = new BasicModel(200, "ok"); + basicModel.setResult(maps); + mav.setModel(basicModel); return mav; } From 8e636616b98048b114655c2e95b44d18f1606af1 Mon Sep 17 00:00:00 2001 From: majintao Date: Tue, 24 Jun 2025 13:32:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A0=B7=E6=9C=AC=E9=87=8F=E5=8F=8A=E5=9D=87=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/seawater/dao/SeawaterDaoImpl.java | 104 +++++++++--------- .../open/controllers/HouseController.java | 8 +- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java index dd02c43b2..6f1a47581 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java @@ -1044,13 +1044,13 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl 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 mustList = new ArrayList(); if (StringUtils.isNotBlank(city)) { JSONObject term = new JSONObject(); @@ -1082,84 +1082,82 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl 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 headers = new HashMap(); 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> parseMonthlyAggToList(JSONObject response) { List> resultList = new ArrayList>(); @@ -1172,7 +1170,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl 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 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 map = new HashMap(); map.put("month", monthKey); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java index 86d6996e4..773bb3dc8 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java @@ -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> 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>(); + } BasicModel basicModel = new BasicModel(200, "ok"); basicModel.setResult(maps); mav.setModel(basicModel);