diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationController.java index 1ea518efa..36af6dfbc 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationController.java @@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletResponse; import com.fangjia.dal.mongo.model.*; import com.fangjia.service.datastore.*; +import com.fangjia.service.mongo.fangjia.*; import net.sf.json.JSONObject; import org.apache.commons.codec.digest.DigestUtils; @@ -152,13 +153,6 @@ import com.fangjia.service.fangjia.LoanProductService; import com.fangjia.service.fangjia.LoanProductTagService; import com.fangjia.service.fsh.CityNewPriceService; import com.fangjia.service.menu.MenuCategoryEnum; -import com.fangjia.service.mongo.fangjia.AddressMatchLogService; -import com.fangjia.service.mongo.fangjia.CopyrightConfigService; -import com.fangjia.service.mongo.fangjia.FangjiaCommonLogService; -import com.fangjia.service.mongo.fangjia.InputUserInfoService; -import com.fangjia.service.mongo.fangjia.MetroService; -import com.fangjia.service.mongo.fangjia.ServerAreaService; -import com.fangjia.service.mongo.fangjia.SnapDataService; import com.fangjia.service.news.NewsService; import com.fangjia.service.pds.AlgorithmRuleService; import com.fangjia.service.pds.DistrictHouseNumberService; @@ -192,6 +186,7 @@ public class EvaluationController { private HouseService houseService; private RegionStatService regionStatService; private CitySellStatService citySellStatService; + private RegionSellStatService regionSellStatService; private MenuService menuService; private CpcService cpcService; private DistrictStatRentService districtStatRentService; @@ -3607,10 +3602,11 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt private Map buildStatJson(String city, String region, String block, Date startDate) { List regionStatList = null; List citySellStats = null; + List regionSellStats = null; Map oprions = new HashMap(); Date currentDate = new Date(); if (city != null && region != null) { - regionStatList = regionStatService.findRegionStat(city, region, null, startDate, currentDate); + regionSellStats = regionSellStatService.findRegionSellStat(city, region, Integer.parseInt(DateUtil.formatByPattern(startDate, "yyyyMM")), Integer.parseInt(DateUtil.formatByPattern(currentDate, "yyyyMM"))); oprions.put("name", region); } else if (city != null) { citySellStats = citySellStatService.findCitySellStat(city, Integer.parseInt(DateUtil.formatByPattern(startDate, "yyyyMM")), Integer.parseInt(DateUtil.formatByPattern(currentDate, "yyyyMM"))); @@ -3629,6 +3625,11 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt map.put(re.getDate().toString().substring(0, 4) + "." + re.getDate().toString().substring(4, 6), re.getAvgPrice()); } } + if (CollectionUtils.isNotEmpty(regionSellStats)) { + for (RegionSellStat re : regionSellStats) { + map.put(re.getDate().toString().substring(0, 4) + "." + re.getDate().toString().substring(4, 6), re.getAvgPrice()); + } + } return map; } @@ -4738,4 +4739,8 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt public void setCitySellStatService(CitySellStatService citySellStatService) { this.citySellStatService = citySellStatService; } + + public void setRegionSellStatService(RegionSellStatService regionSellStatService) { + this.regionSellStatService = regionSellStatService; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDao.java index 65c0123ef..87a77e9a2 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDao.java @@ -1,8 +1,13 @@ package com.fangjia.dal.mongo.dao; import com.fangjia.dal.MongoDao; +import com.fangjia.dal.mongo.model.CitySellStat; import com.fangjia.dal.mongo.model.RegionSellStat; +import java.util.List; + public interface RegionSellStatDao extends MongoDao { + List findRegionSellStat(String city, String region, Integer startDate, Integer endDate); + } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDaoImpl.java index 389c4e30d..940c9b9da 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDaoImpl.java @@ -1,9 +1,31 @@ package com.fangjia.dal.mongo.dao; import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.QueryParam; +import com.fangjia.dal.SortParam; +import com.fangjia.dal.mongo.model.CitySellStat; import com.fangjia.dal.mongo.model.RegionSellStat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class RegionSellStatDaoImpl extends MongoDaoImpl implements RegionSellStatDao { + @Override + public List findRegionSellStat(String city, String region, Integer startDate, Integer endDate) { + List params = new ArrayList(); + params.add(new QueryParam("city", city)); + params.add(new QueryParam("region", region)); + params.add(new QueryParam("date", QueryParam.LESS_THAN_EQUAL_OPERATOR, endDate)); + if (startDate!=null) { + params.add(new QueryParam("date", QueryParam.GREATER_THAN_EQUAL_OPERATOR, startDate)); + } + + List sortParms = new ArrayList(1); + sortParms.add(new SortParam("date", true)); + List statList = findAllByParams(params, sortParms); + return statList; + } } 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 58f051b5b..708a8bcca 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 @@ -33,4 +33,6 @@ public interface RegionSellStatService { RegionSellStat findNewestRegionPrice(String city, String region); + + List findRegionSellStat(final String city, final String region, final Integer startDate, final Integer endDate); } 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 66c5f6b81..3d3632cf6 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 @@ -121,6 +121,16 @@ public class RegionSellStatServiceImpl implements RegionSellStatService { }); } + @Override + public List findRegionSellStat(final String city, final String region, final Integer startDate, final Integer endDate) { + return CacheUtils.getValue(this.getClass(), city, String.valueOf(endDate + startDate), + CacheUtils.CachePolicyEnum.MIDDLE, new Closure, String>() { + public List execute(String input) { + return regionSellStatDao.findRegionSellStat(city, region, startDate, endDate); + } + }); + } + public void setRegionSellStatDao(RegionSellStatDao regionSellStatDao) { this.regionSellStatDao = regionSellStatDao; }