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 c57c15dbb..14c7e4c0c 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 @@ -19,6 +19,7 @@ import com.fangjia.coresite.model.*; import com.fangjia.dal.mongo.model.*; import com.fangjia.service.bo.*; import com.fangjia.service.datastore.*; +import com.fangjia.service.mongo.fangjia.RegionSellStatService; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; @@ -74,6 +75,7 @@ public class TrendController { private final static Logger LOGGER = LoggerFactory.getLogger(TrendController.class); private CitySellStatService citySellStatService; + private RegionSellStatService regionSellStatService; public Object trendChartAction(TrendModel model, HttpServletRequest request) { TrendView trendView = TrendViewFactory.getInstance().create(model); @@ -175,10 +177,10 @@ public class TrendController { //DistrictStatBo statBo = getDistrictStat(new DistrictKey(trendView.getCityName(), trendView.getRegion(), trendView.getDistrictName())); DistrictStatBo statBo = getNearestDistrictStat(new DistrictKey(trendView.getCityName(), trendView.getRegion(), trendView.getDistrictName())); model.setDistrictStatBo(statBo); - } else if (trendView.getType().equals(ViewType.region) || trendView.getType().equals(ViewType.block)) { + } else if (trendView.getType().equals(ViewType.region)) { //RegionStatBo regionStat = getRegionBlockStat(trendView.getCityName(), trendView.getRegion(), trendView.getBlock()); - RegionStatBo regionStat = getNearestRegionStat(trendView.getCityName(), trendView.getRegion(), trendView.getBlock()); - model.setRegionStatBo(regionStat); + RegionSellStatBo regionSellStatBo = getNearestRegionSellStat(trendView.getCityName(), trendView.getRegion()); + model.setRegionSellStatBo(regionSellStatBo); model.setRegion(trendView.getRegion()); } else if (trendView.getType().equals(ViewType.city)) { //RegionStatBo regionStat = getRegionBlockStat(trendView.getCityName(), null, null); @@ -670,13 +672,16 @@ public class TrendController { private List buildStatJson(String city, String region, String block, int weeks) { List regionStatList = null; List citySellStatList = null; + List regionSellStatList = null; Map oprions = new HashMap(); Date currentDate = new Date(); if (city != null && region != null && block != null) { regionStatList = regionStatService.findRegionStat(city, region, block, currentDate, weeks); oprions.put("name", block + "板块"); } else if (city != null && region != null) { - regionStatList = regionStatService.findRegionStat(city, region, null, currentDate, weeks); + //regionStatList = regionStatService.findRegionStat(city, region, null, currentDate, weeks); + int month = weeks / 4; + regionSellStatList = regionSellStatService.getAllWithMonths(city, region, month); oprions.put("name", region); } else if (city != null) { //regionStatList = regionStatService.findRegionStat(city, null, null, currentDate, weeks); @@ -703,6 +708,14 @@ public class TrendController { ja.put(re.getAvgPrice()); splineJa.put(ja); } + } else if (CollectionUtils.isNotEmpty(regionSellStatList)) { + for (int i = regionSellStatList.size() - 1; i >= 0; i--) { + RegionSellStat re = regionSellStatList.get(i); + JSONArray ja = new JSONArray(); + ja.put(DateUtil.getBeforeDay(DateUtil.parseDate(re.getDate().toString(), "yyyyMM"), -1).getTime()); + ja.put(re.getAvgPrice()); + splineJa.put(ja); + } } if (splineJa.length() > 0) { @@ -854,6 +867,38 @@ public class TrendController { return null; } + /** + * 区域均价 + * + * @param city + * @return + */ + private RegionSellStatBo getNearestRegionSellStat(String city, String region) { + RegionSellStatBo ret = null; + List regionSellStats = null; + Integer startDate = Integer.valueOf(DateUtil.formatByPattern(DateUtils.addMonths(new Date(), -3), "yyyyMM")); + regionSellStats = regionSellStatService.findNearCityStat(city, region, startDate, 2); + if(regionSellStats!=null && regionSellStats.size()>0){ + RegionSellStatBo bo = new RegionSellStatBo(); + if(regionSellStats.size()==2){ + bo.setAvgPrice(regionSellStats.get(0).getAvgPrice()); + bo.setLastTimeAvgPrice(regionSellStats.get(1).getAvgPrice()); + int monthMarkup = (regionSellStats.get(0).getAvgPrice()-regionSellStats.get(1).getAvgPrice())*10000/regionSellStats.get(1).getAvgPrice(); + bo.setMonthMarkup(monthMarkup); + + }else{ + bo.setAvgPrice(regionSellStats.get(0).getAvgPrice()); + } + + RegionSellStat rs = regionSellStatService.findStartStat(city, region); + if(rs!=null){ + bo.setStartDate(rs.getDate()); + } + return bo; + } + return null; + } + private RegionStatBo getNearestRegionStat(String city, String region, String block){ RegionStatBo ret = null; @@ -1315,4 +1360,8 @@ public class TrendController { public void setCitySellStatService(CitySellStatService citySellStatService) { this.citySellStatService = citySellStatService; } + + public void setRegionSellStatService(RegionSellStatService regionSellStatService) { + this.regionSellStatService = regionSellStatService; + } } 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 5119348ea..b2a636648 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 @@ -32,6 +32,7 @@ public class TrendModel extends BaseModel implements TrendViewModel { private DistrictStatBo districtStatBo; private RegionStatBo regionStatBo; private CitySellStatBo citySellStatBo; + private RegionSellStatBo regionSellStatBo; private String affectKeyword; private int chartWidth; private int chartHeight; @@ -339,4 +340,8 @@ public class TrendModel extends BaseModel implements TrendViewModel { public void setCitySellStatBo(CitySellStatBo citySellStatBo) { this.citySellStatBo = citySellStatBo; } + + public void setRegionSellStatBo(RegionSellStatBo regionSellStatBo) { + this.regionSellStatBo = regionSellStatBo; + } } diff --git a/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl b/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl index 7ba92620a..809bbb29a 100644 --- a/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl +++ b/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl @@ -113,7 +113,7 @@
- <#if districtStatBo?? || regionStatBo?? || citySellStatBo??> + <#if districtStatBo?? || regionStatBo?? || citySellStatBo?? || regionSellStatBo??> <#if count??>
${count!}
<#if districtStatBo??>
<#if districtStatBo.lastTimeDistrictStat??>${districtStatBo.lastTimeDistrictStat.avgPrice}<#else>鏆傛棤
@@ -123,6 +123,11 @@
${citySellStatBo.lastTimeAvgPrice!}
${citySellStatBo.avgPrice!}
${(citySellStatBo.monthMarkup/100)?string('0.00')}%
+ <#elseif regionSellStatBo??> +
${regionSellStatBo.lastTimeAvgPrice!}
+
${regionSellStatBo.avgPrice!}
+
${(regionSellStatBo.monthMarkup/100)?string('0.00')}%
+ <#elseif regionStatBo??>
${regionStatBo.lastTimeAvgPrice!}
${regionStatBo.avgPrice!}
@@ -163,7 +168,7 @@
- <#if districtStatBo?? || regionStatBo?? || citySellStatBo??> + <#if districtStatBo?? || regionStatBo?? || citySellStatBo?? || regionSellStatBo??>
  • 涓嬭浇
  • 鎵撳嵃
  • @@ -185,7 +190,7 @@
    - <#if districtStatBo?? || regionStatBo?? || citySellStatBo??> + <#if districtStatBo?? || regionStatBo?? || citySellStatBo?? || regionSellStatBo??> <#else>
    @@ -482,7 +487,7 @@ var down_pic_temp = 0; $(document).ready(function(){ //璧板娍鍥� - <#if districtStatBo?? || regionStatBo?? || citySellStatBo??> + <#if districtStatBo?? || regionStatBo?? || citySellStatBo?? || regionSellStatBo??> <#if type??> <#if type == '4' || type == 'quarter'> var url = Constants.cityUrl + '/trend/quarterData?defaultCityName=${cityName}&districtName=${districtName!}®ion=${region!}&block=${block!}&keyword=${keyword!}'; 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 43cb2b886..dc427bbd2 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 @@ -1,9 +1,31 @@ package com.fangjia.service.mongo.fangjia; +import java.util.Date; import java.util.List; +import com.fangjia.dal.mongo.model.CitySellStat; import com.fangjia.dal.mongo.model.RegionSellStat; +import com.fangjia.dal.mongo.model.RegionStat; public interface RegionSellStatService { + /** + * 获取过去 monCount 个月的数据(不包含本月数据) + * @param city + * @param region + * @param monthCount + * @return + */ + List getAllWithMonths(String city, String region, int monthCount); + + List findNearCityStat(String city, final String region, Integer startDate, int count); + + /** + * 查询均价开始的最早时间 + * @param city + * @return + */ + RegionSellStat findStartStat(String city, final 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 78ab9ee5f..d207fb0e3 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 @@ -1,16 +1,89 @@ package com.fangjia.service.mongo.fangjia; import java.util.ArrayList; +import java.util.Date; import java.util.List; +import com.fangjia.core.util.CacheUtils; +import com.fangjia.core.util.DateUtil; +import com.fangjia.dal.mongo.model.*; +import com.google.common.collect.ImmutableList; import org.apache.commons.lang.StringUtils; import com.fangjia.dal.QueryParam; import com.fangjia.dal.SortParam; import com.fangjia.dal.mongo.dao.RegionSellStatDao; import com.fangjia.dal.mongo.model.RegionSellStat; +import org.sothis.core.util.Closure; public class RegionSellStatServiceImpl implements RegionSellStatService { + private RegionSellStatDao regionSellStatDao; + @Override + public List getAllWithMonths(final String city, final String region, final int monthCount) { + return CacheUtils.getValue(this.getClass(), "getAllWithMonths",city+"_"+monthCount, CacheUtils.CachePolicyEnum.LONG, + new Closure, String>() { + @Override + public List execute(String input) { + System.out.println("getAllWithMonths"); + Date now = new Date(); + Date lastMonth = DateUtil.getBeforeDate(now, -1); + 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) { + return CacheUtils.getValue(this.getClass(), "findNearRegionStat",city+"_"+startDate, CacheUtils.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("region", region)); + q.add(new QueryParam("date", QueryParam.GREATER_THAN_EQUAL_OPERATOR, startDate)); + + List s = new ArrayList(); + s.add(new SortParam("date", false)); + return regionSellStatDao.findAllByParams(q, s, count); + } + }); + } + + @Override + public RegionSellStat findStartStat(final String city, final String region) { + return CacheUtils.getValue(this.getClass(), "findStartStat",city, CacheUtils.CachePolicyEnum.LONG, + new Closure() { + @Override + public RegionSellStat execute(String input) { + List q = new ArrayList(5); + q.add(new QueryParam("city", city)); + q.add(new QueryParam("region", region)); + + List s = new ArrayList(); + s.add(new SortParam("date", true)); + return regionSellStatDao.findFirstByParams(q, s); + } + }); + } + + public void setRegionSellStatDao(RegionSellStatDao regionSellStatDao) { + this.regionSellStatDao = regionSellStatDao; + } }