From 28eed814f7cf8d74f02027f5024d521a96f13a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Fri, 13 Jun 2025 15:13:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=80=A0=E4=BC=B0=E5=80=BC=E4=B9=9F?= =?UTF-8?q?=E5=9F=8E=E5=B8=82=E5=9D=87=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/EvaluationController.java | 48 +++++++------------ .../dal/mongo/dao/CitySellStatDao.java | 7 +++ .../dal/mongo/dao/CitySellStatDaoImpl.java | 23 +++++++++ .../datastore/CitySellStatService.java | 3 ++ .../datastore/CitySellStatServiceImpl.java | 11 +++++ 5 files changed, 62 insertions(+), 30 deletions(-) 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 30a73fa2f..1ea518efa 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 @@ -28,6 +28,8 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.fangjia.dal.mongo.model.*; +import com.fangjia.service.datastore.*; import net.sf.json.JSONObject; import org.apache.commons.codec.digest.DigestUtils; @@ -105,19 +107,6 @@ import com.fangjia.dal.mongo.fangjia.model.LoanLeads; import com.fangjia.dal.mongo.fangjia.model.LoanProduct; import com.fangjia.dal.mongo.fangjia.model.LoanProductTag; import com.fangjia.dal.mongo.fangjia.model.ServerArea; -import com.fangjia.dal.mongo.model.AddressMatchLog; -import com.fangjia.dal.mongo.model.CityNewPrice; -import com.fangjia.dal.mongo.model.DistrictSellStat; -import com.fangjia.dal.mongo.model.DistrictStat; -import com.fangjia.dal.mongo.model.Evaluation; -import com.fangjia.dal.mongo.model.FangjiaCommonLog; -import com.fangjia.dal.mongo.model.HouseLoudong; -import com.fangjia.dal.mongo.model.HousePrice; -import com.fangjia.dal.mongo.model.InputUserInfo; -import com.fangjia.dal.mongo.model.IpCount; -import com.fangjia.dal.mongo.model.RegionStat; -import com.fangjia.dal.mongo.model.SnapData; -import com.fangjia.dal.mongo.model.ThirdIpCount; import com.fangjia.dal.mongo.model.bkoff.AdLog; import com.fangjia.dal.mongo.model.bkoff.Advertisement; import com.fangjia.dal.mongo.pds.model.AlgorithmRule; @@ -145,16 +134,6 @@ import com.fangjia.service.chart.generator.ChartGenerator; import com.fangjia.service.chart.ofc.bean.OfcStyleConfig; import com.fangjia.service.common.CookieName; import com.fangjia.service.cpc.CpcService; -import com.fangjia.service.datastore.DistrictDto; -import com.fangjia.service.datastore.DistrictSellStatService; -import com.fangjia.service.datastore.DistrictService; -import com.fangjia.service.datastore.EvaluationService; -import com.fangjia.service.datastore.HouseService; -import com.fangjia.service.datastore.IpCountService; -import com.fangjia.service.datastore.RegionStatService; -import com.fangjia.service.datastore.ReportDistrictInfoService; -import com.fangjia.service.datastore.SchoolService; -import com.fangjia.service.datastore.ThirdIpCountService; import com.fangjia.service.datastore.bean.DistrictQueryBean; import com.fangjia.service.datastore.bean.EvaluationBeforeLoanBean; import com.fangjia.service.datastore.bean.HousePicEnum; @@ -212,6 +191,7 @@ public class EvaluationController { private SnapDataService snapDataService; private HouseService houseService; private RegionStatService regionStatService; + private CitySellStatService citySellStatService; private MenuService menuService; private CpcService cpcService; private DistrictStatRentService districtStatRentService; @@ -3626,23 +3606,28 @@ 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; Map oprions = new HashMap(); Date currentDate = new Date(); if (city != null && region != null) { regionStatList = regionStatService.findRegionStat(city, region, null, startDate, currentDate); oprions.put("name", region); } else if (city != null) { - regionStatList = regionStatService.findRegionStat(city, null, null, startDate, currentDate); + citySellStats = citySellStatService.findCitySellStat(city, Integer.parseInt(DateUtil.formatByPattern(startDate, "yyyyMM")), Integer.parseInt(DateUtil.formatByPattern(currentDate, "yyyyMM"))); oprions.put("name", city); } - if (regionStatList == null) { - return null; - } Map map = new HashMap(); SimpleDateFormat format = new SimpleDateFormat("yyyy.MM"); - for (RegionStat re : regionStatList) { - map.put(format.format(DateUtil.getBeforeDay(re.getWeekend(), -1)),re.getAvgPrice()); + if (CollectionUtils.isNotEmpty(regionStatList)) { + for (RegionStat re : regionStatList) { + map.put(format.format(DateUtil.getBeforeDay(re.getWeekend(), -1)), re.getAvgPrice()); + } + } + if (CollectionUtils.isNotEmpty(citySellStats)) { + for (CitySellStat re : citySellStats) { + map.put(re.getDate().toString().substring(0, 4) + "." + re.getDate().toString().substring(4, 6), re.getAvgPrice()); + } } return map; } @@ -4749,5 +4734,8 @@ public Object checkUserAction(EvaluationModel model, HttpServletRequest req, Htt public void setIpCountService(IpCountService ipCountService) { this.ipCountService = ipCountService; } - + + public void setCitySellStatService(CitySellStatService citySellStatService) { + this.citySellStatService = citySellStatService; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDao.java index d726b3806..c6ade6b04 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDao.java @@ -2,9 +2,16 @@ package com.fangjia.dal.mongo.dao; import com.fangjia.dal.MongoDao; import com.fangjia.dal.mongo.model.CitySellStat; +import com.fangjia.dal.mongo.model.RegionStat; + +import java.util.Date; +import java.util.List; /** * Created by hubingliang on 2016/12/8. */ public interface CitySellStatDao extends MongoDao { + + List findCitySellStat(String city, Integer startDate, Integer endDate); + } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDaoImpl.java index f09616ce9..56eb779a2 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDaoImpl.java @@ -1,10 +1,33 @@ 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.RegionStat; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; /** * Created by hubingliang on 2016/12/8. */ public class CitySellStatDaoImpl extends MongoDaoImpl implements CitySellStatDao { + + @Override + public List findCitySellStat(String city, Integer startDate, Integer endDate) { + List params = new ArrayList(); + params.add(new QueryParam("city", city)); + 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/datastore/CitySellStatService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CitySellStatService.java index 9f218fd26..7967206ac 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 @@ -45,4 +45,7 @@ public interface CitySellStatService { CitySellStat findStartStat(String city); List findCityOrderByAvgPrice(final String city, final Integer startDate, final int count) ; + + List findCitySellStat(String city, Integer startDate, Integer endDate); + } 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 b4e31ac45..77a7fad14 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 @@ -11,6 +11,7 @@ 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.dal.mongo.model.StatFlag; import com.fangjia.service.bo.DistrictStatBo; import com.google.common.collect.ImmutableList; @@ -150,4 +151,14 @@ public class CitySellStatServiceImpl implements CitySellStatService { return citySellStatDao.findAllByParams(q, s, count); } + @Override + public List findCitySellStat(final String city, final Integer startDate, final Integer endDate) { + return CacheUtils.getValue(this.getClass(), city, String.valueOf(endDate + startDate), + CachePolicyEnum.MIDDLE, new Closure, String>() { + public List execute(String input) { + return citySellStatDao.findCitySellStat(city, startDate, endDate); + } + }); + } + }