From edaa730b5d5ce21a55694daf698968ed383ecec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Thu, 26 Jun 2025 09:56:32 +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 | 2 +- .../mongo/fangjia/RegionSellStatService.java | 9 ++++++++ .../fangjia/RegionSellStatServiceImpl.java | 21 +++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) 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 a9925049d..92f546ee6 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 @@ -707,7 +707,7 @@ public class TrendController { } else if (city != null && region != null) { //regionStatList = regionStatService.findRegionStat(city, region, null, currentDate, weeks); int month = weeks / 4; - regionSellStatList = regionSellStatService.getAllWithMonths(city, region, month); + regionSellStatList = regionSellStatService.getAllWithCurrMonths(city, region, month); oprions.put("name", region); } else if (city != null) { //regionStatList = regionStatService.findRegionStat(city, null, null, currentDate, weeks); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/RegionSellStatService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/RegionSellStatService.java index 708a8bcca..e854127fd 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/RegionSellStatService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/RegionSellStatService.java @@ -18,6 +18,15 @@ public interface RegionSellStatService { */ List getAllWithMonths(String city, String region, int monthCount); + /** + * 获取过去 monCount 个月的数据(包含本月数据) + * @param city + * @param region + * @param monthCount + * @return + */ + List getAllWithCurrMonths(String city, String region, int monthCount); + List findNearCityStat(String city, final String region, Integer startDate, int count); /** diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/RegionSellStatServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/RegionSellStatServiceImpl.java index 3d3632cf6..fb838c614 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/RegionSellStatServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/RegionSellStatServiceImpl.java @@ -85,6 +85,27 @@ public class RegionSellStatServiceImpl implements RegionSellStatService { }); } + + @Override + public List getAllWithCurrMonths(final String city, final String region, final int monthCount) { + Date now = new Date(); + Date lastMonth = DateUtil.getBeforeDate(now, 0); + Date monthInLastYear = DateUtil.getBeforeDate(now, -1 * monthCount); + int lastMonthNum = DateUtil.getYear(lastMonth) * 100 + DateUtil.getMonth(lastMonth); + int monthInLastYearNum = DateUtil.getYear(monthInLastYear) * 100 + DateUtil.getMonth(monthInLastYear); + + List queryParams = ImmutableList.of( + new QueryParam("city", city), + new QueryParam("region", region), + new QueryParam("date", QueryParam.LESS_THAN_EQUAL_OPERATOR, lastMonthNum), + new QueryParam("date", QueryParam.GREATER_THAN_EQUAL_OPERATOR, monthInLastYearNum) + ); + List sortParams = ImmutableList.of( + new SortParam("date", false) + ); + return regionSellStatDao.findAllByParams(queryParams, sortParams); + + } @Override public List findNearCityStat(final String city, final String region, final Integer startDate, final int count) {