From 36d87966e939e021ab7bfc03ca6c3700b8d5f060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Thu, 26 Jun 2025 09:54:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coresite/controllers/TrendController.java | 4 ++-- .../datastore/CitySellStatService.java | 10 ++++++++++ .../datastore/CitySellStatServiceImpl.java | 20 +++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java index e3ee9031a..a9925049d 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java @@ -167,7 +167,7 @@ public class TrendController { model.setRegionItems(getRegionItems(model)); model.setBlockItems(getRegionBlocks(model)); - List citySellStats = citySellStatService.getAllWithMonths(city, 2); + List citySellStats = citySellStatService.getAllWithCurrMonths(city, 2); model.setCityStatInfoBos(findCitysAvgPricePlus(city,citySellStats.get(0).getDate(), 10)); model.setDefaultCityName(city); TrendView trendView = TrendViewFactory.getInstance().create(model); @@ -712,7 +712,7 @@ public class TrendController { } else if (city != null) { //regionStatList = regionStatService.findRegionStat(city, null, null, currentDate, weeks); int month = weeks / 4; - citySellStatList = citySellStatService.getAllWithMonths(city, month); + citySellStatList = citySellStatService.getAllWithCurrMonths(city, month); oprions.put("name", city); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CitySellStatService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CitySellStatService.java index 7967206ac..3fde3a9ea 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CitySellStatService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CitySellStatService.java @@ -21,6 +21,16 @@ public interface CitySellStatService { */ List getAllWithMonths(String city, int monthCount); + /** + * 获取过去 monCount 个月的数据(包含本月数据) + * @param city + * @param region + * @param name + * @param monthCount + * @return + */ + List getAllWithCurrMonths(String city, int monthCount); + /** * 查找城市均价排名前Top条数据 * @param top 取的名次数 diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CitySellStatServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CitySellStatServiceImpl.java index 77a7fad14..4ee328a93 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CitySellStatServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CitySellStatServiceImpl.java @@ -58,6 +58,26 @@ public class CitySellStatServiceImpl implements CitySellStatService { } + @Override + public List getAllWithCurrMonths(final String city, final int monthCount) { + Date now = new Date(); + Date nowMonth = DateUtil.getBeforeDate(now, 0); + Date lastMonth = DateUtil.getBeforeDate(now, -1 * monthCount); + + int nowMonthNum = DateUtil.getYear(nowMonth) * 100 + DateUtil.getMonth(now); + int lastMonthNum = DateUtil.getYear(lastMonth) * 100 + DateUtil.getMonth(lastMonth); + + List queryParams = ImmutableList.of( + new QueryParam("city", city), + new QueryParam("date", QueryParam.LESS_THAN_EQUAL_OPERATOR, nowMonthNum), + new QueryParam("date", QueryParam.GREATER_THAN_EQUAL_OPERATOR, lastMonthNum) + ); + List sortParams = ImmutableList.of( + new SortParam("date", false) + ); + return citySellStatDao.findAllByParams(queryParams, sortParams); + } + @Override public List findTopCitySellStat(final int top, final int type) { String key = top + "_" + type;