From d6e0d6bcff52f836ae82f1b340d53e653cbc81da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Fri, 13 Jun 2025 13:36:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=80=A0=E5=9F=8E=E5=B8=82=E6=8E=92?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coresite/controllers/TrendController.java | 32 +++++++++++++++++-- .../fangjia/coresite/model/TrendModel.java | 4 +++ .../src/main/webapp/trend/trend.ftl | 10 ++++-- .../datastore/CitySellStatService.java | 2 ++ .../datastore/CitySellStatServiceImpl.java | 16 +++++++++- 5 files changed, 57 insertions(+), 7 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 14c7e4c0c..34543d7be 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 @@ -166,7 +166,9 @@ public class TrendController { model.setRegionItems(getRegionItems(model)); model.setBlockItems(getRegionBlocks(model)); - model.setCityStatInfoBos(findCitysAvgPrice(10)); + + List citySellStats = citySellStatService.getAllWithMonths(city, 2); + model.setCityStatInfoBos(findCitysAvgPricePlus(city,citySellStats.get(0).getDate(), 10)); model.setDefaultCityName(city); TrendView trendView = TrendViewFactory.getInstance().create(model); if (trendView == null) { @@ -270,6 +272,30 @@ public class TrendController { return Collections.EMPTY_LIST; } + private List findCitysAvgPricePlus(String city, Integer startDate, int limit){ + List cityStatInfoBos = new ArrayList(); + List citySellStats = citySellStatService.findCityOrderByAvgPrice(null, startDate, limit); + for(int i=0;i - <#if districtStatBo?? || regionStatBo??> + <#if districtStatBo?? || regionStatBo?? || citySellStatBo?? || regionSellStatBo??>

${affectValue}房产均价走势

-

<#if districtStatBo??>${districtStatBo.startYear!}<#else><#if regionStatBo?? && regionStatBo.startDate??>${regionStatBo.startDate?string('yyyy')}-${.now?string('yyyy')} | 周度 | 元/㎡ | 数据来源:房价网

+

+ <#if districtStatBo??>${districtStatBo.startYear!} + <#elseif citySellStatBo?? && citySellStatBo.startDate??>${citySellStatBo.startDate} + <#elseif regionSellStatBo?? && regionSellStatBo.startDate??>${regionSellStatBo.startDate} + + -${.now?string('yyyy')} | 周度 | 元/㎡ | 数据来源:房价网

${descWord}

@@ -127,7 +132,6 @@
${regionSellStatBo.lastTimeAvgPrice!}
${regionSellStatBo.avgPrice!}
${(regionSellStatBo.monthMarkup/100)?string('0.00')}%
- <#elseif regionStatBo??>
${regionStatBo.lastTimeAvgPrice!}
${regionStatBo.avgPrice!}
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 79350a49c..9f218fd26 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 @@ -43,4 +43,6 @@ public interface CitySellStatService { * @return */ CitySellStat findStartStat(String city); + + List findCityOrderByAvgPrice(final String city, final Integer startDate, final int count) ; } 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 d754808d9..b4e31ac45 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 @@ -106,7 +106,7 @@ public class CitySellStatServiceImpl implements CitySellStatService { @Override public List findNearCityStat(final String city, final Integer startDate, final int count) { - return CacheUtils.getValue(this.getClass(), "findNearRegionStat",city+"_"+startDate, CachePolicyEnum.LONG, + return CacheUtils.getValue(this.getClass(), "findNearCityStat",city+"_"+startDate, CachePolicyEnum.LONG, new Closure, String>() { @Override public List execute(String input) { @@ -136,4 +136,18 @@ public class CitySellStatServiceImpl implements CitySellStatService { } }); } + + @Override + public List findCityOrderByAvgPrice(final String city, final Integer startDate, final int count) { + List q = new ArrayList(); + if (StringUtils.isNotBlank(city)) { + q.add(new QueryParam("city", city)); + } + q.add(new QueryParam("date", QueryParam.GREATER_THAN_EQUAL_OPERATOR, startDate)); + + List s = new ArrayList(); + s.add(new SortParam("avgPrice", false)); + return citySellStatDao.findAllByParams(q, s, count); + } + }