From bc11a352c21337b8daf233e6c6b02631a6ae2ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Fri, 13 Jun 2025 09:54:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=BC=80=E5=9F=8E=E5=B8=82=E5=8C=BA?= =?UTF-8?q?=E5=9F=9Fstat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coresite/controllers/TrendController.java | 50 ++++++--- .../fangjia/coresite/model/TrendModel.java | 9 ++ .../main/webapp/yinLianEvaluation/index.ftl | 8 +- .../fangjia/service/bo/CitySellStatBo.java | 101 +++++++++++++++++ .../fangjia/service/bo/RegionSellStatBo.java | 104 ++++++++++++++++++ .../datastore/CitySellStatService.java | 11 ++ .../datastore/CitySellStatServiceImpl.java | 42 +++++-- .../service/datastore/RegionSellService.java | 14 +++ .../mongo/fangjia/RegionSellStatService.java | 5 - .../fangjia/RegionSellStatServiceImpl.java | 49 --------- 10 files changed, 314 insertions(+), 79 deletions(-) create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/bo/CitySellStatBo.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/bo/RegionSellStatBo.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/datastore/RegionSellService.java 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 6351025d3..9d83f1f56 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 @@ -14,8 +14,11 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; +import com.fangjia.core.City; import com.fangjia.coresite.model.*; +import com.fangjia.dal.mongo.model.*; import com.fangjia.service.bo.*; +import com.fangjia.service.datastore.*; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; @@ -39,21 +42,9 @@ import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.common.FangjiaServerAreaContextHolder; import com.fangjia.dal.datastore.model.News; import com.fangjia.dal.mongo.fangjia.model.ServerArea; -import com.fangjia.dal.mongo.model.CityTradeStat; -import com.fangjia.dal.mongo.model.DistrictNewPrice; -import com.fangjia.dal.mongo.model.DistrictSellStat; -import com.fangjia.dal.mongo.model.DistrictStat; -import com.fangjia.dal.mongo.model.DistrictTradeStat; -import com.fangjia.dal.mongo.model.RegionBlock; -import com.fangjia.dal.mongo.model.RegionStat; import com.fangjia.dal.seaweed.model.District; -import com.fangjia.service.datastore.DistrictSellStatService; -import com.fangjia.service.datastore.DistrictService; -import com.fangjia.service.datastore.HouseService; -import com.fangjia.service.datastore.RegionStatService; import com.fangjia.service.datastore.bean.HousePicEnum; import com.fangjia.service.datastore.bean.HouseQueryBean; -import com.fangjia.service.datastore.EvaluationService; import com.fangjia.service.district.DistrictStatService; import com.fangjia.service.district.TradeStatService; import com.fangjia.service.fsh.DistrictNewPriceService; @@ -82,6 +73,8 @@ public class TrendController { private static int QUARTER_WEEK = 13; private final static Logger LOGGER = LoggerFactory.getLogger(TrendController.class); + private CitySellStatService citySellStatService; + public Object trendChartAction(TrendModel model, HttpServletRequest request) { TrendView trendView = TrendViewFactory.getInstance().create(model); if (trendView != null) { @@ -189,8 +182,8 @@ public class TrendController { model.setRegion(trendView.getRegion()); } else if (trendView.getType().equals(ViewType.city)) { //RegionStatBo regionStat = getRegionBlockStat(trendView.getCityName(), null, null); - RegionStatBo regionStat = getNearestRegionStat(trendView.getCityName(), null, null); - model.setRegionStatBo(regionStat); + CitySellStatBo citySellStat = getNearestCitySellStat(trendView.getCityName()); + model.setCitySellStatBo(citySellStat); } @@ -826,6 +819,32 @@ public class TrendController { seriesOptions.addAll(data); } } + private CitySellStatBo getNearestCitySellStat(String city) { + CitySellStatBo ret = null; + List citySellStats = null; + Integer startDate = Integer.valueOf(DateUtil.formatToTightYYYYMMDD(DateUtils.addMonths(new Date(), -3))); + citySellStats = citySellStatService.findNearCityStat(city, startDate, 2); + if(citySellStats!=null && citySellStats.size()>0){ + CitySellStatBo bo = new CitySellStatBo(); + if(citySellStats.size()==2){ + bo.setAvgPrice(citySellStats.get(0).getAvgPrice()); + bo.setLastTimeAvgPrice(citySellStats.get(1).getAvgPrice()); + int monthMarkup = (citySellStats.get(0).getAvgPrice()-citySellStats.get(1).getAvgPrice())*10000/citySellStats.get(1).getAvgPrice(); + bo.setMonthMarkup(monthMarkup); + + }else{ + bo.setAvgPrice(citySellStats.get(0).getAvgPrice()); + } + + CitySellStat rs = citySellStatService.findStartStat(city); + if(rs!=null){ + bo.setStartDate(rs.getDate()); + } + return bo; + } + return null; + } + private RegionStatBo getNearestRegionStat(String city, String region, String block){ RegionStatBo ret = null; @@ -1284,4 +1303,7 @@ public class TrendController { this.evaluationService = evaluationService; } + public void setCitySellStatService(CitySellStatService citySellStatService) { + this.citySellStatService = citySellStatService; + } } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/TrendModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/TrendModel.java index 0f6a0fde9..5119348ea 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/TrendModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/TrendModel.java @@ -31,6 +31,7 @@ public class TrendModel extends BaseModel implements TrendViewModel { private String trendDesc; private DistrictStatBo districtStatBo; private RegionStatBo regionStatBo; + private CitySellStatBo citySellStatBo; private String affectKeyword; private int chartWidth; private int chartHeight; @@ -330,4 +331,12 @@ public class TrendModel extends BaseModel implements TrendViewModel { public void setCityStatInfoBos(List cityStatInfoBos) { this.cityStatInfoBos = cityStatInfoBos; } + + public CitySellStatBo getCitySellStatBo() { + return citySellStatBo; + } + + public void setCitySellStatBo(CitySellStatBo citySellStatBo) { + this.citySellStatBo = citySellStatBo; + } } diff --git a/projects/fangjia-coresite/src/main/webapp/yinLianEvaluation/index.ftl b/projects/fangjia-coresite/src/main/webapp/yinLianEvaluation/index.ftl index e9b882a94..7b54d3b4c 100644 --- a/projects/fangjia-coresite/src/main/webapp/yinLianEvaluation/index.ftl +++ b/projects/fangjia-coresite/src/main/webapp/yinLianEvaluation/index.ftl @@ -103,12 +103,12 @@
<#if districtStatBo?? || regionStatBo??> <#if districtStatBo??> -
<#if districtStatBo.lastTimeDistrictStat??>${districtStatBo.lastTimeDistrictStat.avgPrice}<#else>暂无
-
<#if districtStatBo.districtStat??>${districtStatBo.districtStat.avgPrice}<#else>暂无
+
<#if districtStatBo.lastTimeDistrictStat??>${districtStatBo.lastTimeDistrictStat.avgPrice}<#else>暂无
+
<#if districtStatBo.districtStat??>${districtStatBo.districtStat.avgPrice}<#else>暂无
${(districtStatBo.districtStat.weekendMarkup/100)?string('0.00')}%
<#elseif regionStatBo??> -
${regionStatBo.lastTimeAvgPrice!}
-
${regionStatBo.avgPrice!}
+
${regionStatBo.lastTimeAvgPrice!}
+
${regionStatBo.avgPrice!}
${(regionStatBo.weekendMarkup/100)?string('0.00')}%
diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/bo/CitySellStatBo.java b/projects/fangjia-service/src/main/java/com/fangjia/service/bo/CitySellStatBo.java new file mode 100644 index 000000000..5c5121057 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/bo/CitySellStatBo.java @@ -0,0 +1,101 @@ +package com.fangjia.service.bo; + +import java.io.Serializable; +import java.util.Date; + +public class CitySellStatBo implements Serializable { + private static final long serialVersionUID = -5310665233447971693L; + private String city; + private String region; + private String block; + private int avgPrice; + private int weekendMarkup; + // Äêͬ±ÈÕǵø + private Integer yearMarkup; + // Ô»·±ÈÕǵø + private Integer monthMarkup; + private int month; + + private int lastTimeAvgPrice; + private Integer startDate; + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getBlock() { + return block; + } + + public void setBlock(String block) { + this.block = block; + } + + public int getAvgPrice() { + return avgPrice; + } + + public void setAvgPrice(int avgPrice) { + this.avgPrice = avgPrice; + } + + public int getWeekendMarkup() { + return weekendMarkup; + } + + public void setWeekendMarkup(int weekendMarkup) { + this.weekendMarkup = weekendMarkup; + } + + public Integer getYearMarkup() { + return yearMarkup; + } + + public void setYearMarkup(Integer yearMarkup) { + this.yearMarkup = yearMarkup; + } + + public Integer getMonthMarkup() { + return monthMarkup; + } + + public void setMonthMarkup(Integer monthMarkup) { + this.monthMarkup = monthMarkup; + } + + public int getMonth() { + return month; + } + + public void setMonth(int month) { + this.month = month; + } + + public int getLastTimeAvgPrice() { + return lastTimeAvgPrice; + } + + public void setLastTimeAvgPrice(int lastTimeAvgPrice) { + this.lastTimeAvgPrice = lastTimeAvgPrice; + } + + public Integer getStartDate() { + return startDate; + } + + public void setStartDate(Integer startDate) { + this.startDate = startDate; + } +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/bo/RegionSellStatBo.java b/projects/fangjia-service/src/main/java/com/fangjia/service/bo/RegionSellStatBo.java new file mode 100644 index 000000000..1f6e9a520 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/bo/RegionSellStatBo.java @@ -0,0 +1,104 @@ +package com.fangjia.service.bo; + +import java.io.Serializable; +import java.util.Date; + +public class RegionSellStatBo implements Serializable { + private static final long serialVersionUID = -5310665233447971693L; + private String city; + private String region; + private String block; + private int avgPrice; + private int weekendMarkup; + // Äêͬ±ÈÕǵø + private Integer yearMarkup; + // Ô»·±ÈÕǵø + private Integer monthMarkup; + private int month; + + private int lastTimeAvgPrice; + private Integer startDate; + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getBlock() { + return block; + } + + public void setBlock(String block) { + this.block = block; + } + + public int getAvgPrice() { + return avgPrice; + } + + public void setAvgPrice(int avgPrice) { + this.avgPrice = avgPrice; + } + + public int getWeekendMarkup() { + return weekendMarkup; + } + + public void setWeekendMarkup(int weekendMarkup) { + this.weekendMarkup = weekendMarkup; + } + + public Integer getYearMarkup() { + return yearMarkup; + } + + public void setYearMarkup(Integer yearMarkup) { + this.yearMarkup = yearMarkup; + } + + public Integer getMonthMarkup() { + return monthMarkup; + } + + public void setMonthMarkup(Integer monthMarkup) { + this.monthMarkup = monthMarkup; + } + + public int getMonth() { + return month; + } + + public void setMonth(int month) { + this.month = month; + } + + public int getLastTimeAvgPrice() { + return lastTimeAvgPrice; + } + + public void setLastTimeAvgPrice(int lastTimeAvgPrice) { + this.lastTimeAvgPrice = lastTimeAvgPrice; + } + + public Integer getStartDate() { + return startDate; + } + + public void setStartDate(Integer startDate) { + this.startDate = startDate; + } + + + +} 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 08a2582de..79350a49c 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 @@ -2,7 +2,9 @@ package com.fangjia.service.datastore; import com.fangjia.dal.mongo.model.CitySellStat; import com.fangjia.dal.mongo.model.DistrictSellStat; +import com.fangjia.dal.mongo.model.RegionStat; +import java.util.Date; import java.util.List; /** @@ -32,4 +34,13 @@ public interface CitySellStatService { * @return */ CitySellStat findCitySellStatByCity(String city); + + List findNearCityStat(String city, Integer startDate, int count); + + /** + * ²éѯ¾ù¼ۿªʼµÄ×îÔçʱ¼ä + * @param city + * @return + */ + CitySellStat findStartStat(String city); } 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 8e329b935..d754808d9 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 @@ -1,12 +1,6 @@ package com.fangjia.service.datastore; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import com.fangjia.core.util.CacheUtils; import com.fangjia.core.util.DateUtil; @@ -16,9 +10,11 @@ import com.fangjia.dal.SortParam; import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.mongo.dao.CitySellStatDao; import com.fangjia.dal.mongo.model.CitySellStat; +import com.fangjia.dal.mongo.model.RegionStat; import com.fangjia.service.bo.DistrictStatBo; import com.google.common.collect.ImmutableList; +import org.apache.commons.lang.StringUtils; import org.sothis.core.util.Closure; /** @@ -108,4 +104,36 @@ 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, + new Closure, String>() { + @Override + public List execute(String input) { + List q = new ArrayList(5); + 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("date", false)); + return citySellStatDao.findAllByParams(q, s, count); + } + }); + } + + @Override + public CitySellStat findStartStat(final String city) { + return CacheUtils.getValue(this.getClass(), "findStartStat",city, CachePolicyEnum.LONG, + new Closure() { + @Override + public CitySellStat execute(String input) { + List q = new ArrayList(5); + q.add(new QueryParam("city", city)); + + List s = new ArrayList(); + s.add(new SortParam("date", true)); + return citySellStatDao.findFirstByParams(q, s); + } + }); + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/RegionSellService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/RegionSellService.java new file mode 100644 index 000000000..80f2e360b --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/RegionSellService.java @@ -0,0 +1,14 @@ +package com.fangjia.service.datastore; + +import com.fangjia.dal.mongo.model.RegionStat; +import com.fangjia.service.bo.AvgUpdateBo; +import com.fangjia.service.bo.RegionStatBo; +import org.sothis.core.util.Pager; + +import java.util.Date; +import java.util.List; + +public interface RegionSellService { + + +} 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 8033d7603..43cb2b886 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 @@ -5,10 +5,5 @@ import java.util.List; import com.fangjia.dal.mongo.model.RegionSellStat; public interface RegionSellStatService { - - RegionSellStat findNewestRegionPrice(); - - List findAllRegionPriceByCity(String city, Integer date, String sortField, Boolean sortWay); - RegionSellStat findNewestRegionPrice(String city, String region); } 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 082b5e520..78ab9ee5f 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 @@ -11,55 +11,6 @@ import com.fangjia.dal.mongo.dao.RegionSellStatDao; import com.fangjia.dal.mongo.model.RegionSellStat; public class RegionSellStatServiceImpl implements RegionSellStatService { - - private RegionSellStatDao regionSellStatDao; - public RegionSellStatDao getRegionSellStatDao() { - return regionSellStatDao; - } - - public void setRegionSellStatDao(RegionSellStatDao regionSellStatDao) { - this.regionSellStatDao = regionSellStatDao; - } - - @Override - public RegionSellStat findNewestRegionPrice() { - List sortParams = new ArrayList(); - sortParams.add(new SortParam("date", false)); - return regionSellStatDao.findFirstByParams(null, sortParams); - } - - @Override - public List findAllRegionPriceByCity(String city, - Integer date, String sortField, Boolean sortWay) { - List params = new ArrayList(); - params.add(new QueryParam("city", city)); - params.add(new QueryParam("date", date)); - - List sortParams = new ArrayList(); - if(StringUtils.isNotBlank(sortField)){ - sortParams.add(new SortParam(sortField, sortWay)); - }else{ - sortParams.add(new SortParam("mom", false)); - } - - - return regionSellStatDao.findAllByParams(params, sortParams); - } - - @Override - public RegionSellStat findNewestRegionPrice(String city, String region) { - List params = new ArrayList(); - params.add(new QueryParam("city", city)); - params.add(new QueryParam("region", region)); - - List sortParams = new ArrayList(); - sortParams.add(new SortParam("date", false)); - return regionSellStatDao.findFirstByParams(params, sortParams); - } - - - - }