diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/PropertyStatsIndexDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/PropertyStatsIndexDao.java new file mode 100644 index 000000000..c52e73f1e --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/PropertyStatsIndexDao.java @@ -0,0 +1,9 @@ +package com.fangjia.dal.mongo.dao; + +import com.fangjia.dal.MongoDao; +import com.fangjia.dal.mongo.model.PropertyStatsIndex; +import com.fangjia.dal.mongo.model.StatsIndex; + +public interface PropertyStatsIndexDao extends MongoDao { + +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/PropertyStatsIndexDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/PropertyStatsIndexDaoImpl.java new file mode 100644 index 000000000..6c8e5f7b8 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/PropertyStatsIndexDaoImpl.java @@ -0,0 +1,10 @@ +package com.fangjia.dal.mongo.dao; + +import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.mongo.model.PropertyStatsIndex; +import com.fangjia.dal.mongo.model.StatsIndex; + + +public class PropertyStatsIndexDaoImpl extends MongoDaoImpl implements PropertyStatsIndexDao { + +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/StatsIndexModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/StatsIndexModel.java index ec0d88a5a..3d9a4909c 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/StatsIndexModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/StatsIndexModel.java @@ -10,7 +10,10 @@ public class StatsIndexModel { private String id; private String city; - + private String district; + private String name; + private String type; + private String yearmonth; private Integer source; @@ -216,7 +219,28 @@ public class StatsIndexModel { public void setIfNew(Integer ifNew) { this.ifNew = ifNew; } - - - + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/PropertyStatsIndexService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/PropertyStatsIndexService.java new file mode 100644 index 000000000..dfd0645bc --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/PropertyStatsIndexService.java @@ -0,0 +1,12 @@ +package com.fangjia.service.mongo.fangjia; + +import com.fangjia.dal.mongo.model.PropertyStatsIndex; +import com.fangjia.dal.mongo.model.StatsIndex; + +import java.util.List; + +public interface PropertyStatsIndexService { + + PropertyStatsIndex findById(String id); + PropertyStatsIndex findStatsIndex(String city, String district, String name, String yearmonth, String cat); +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/PropertyStatsIndexServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/PropertyStatsIndexServiceImpl.java new file mode 100644 index 000000000..73bea049a --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/PropertyStatsIndexServiceImpl.java @@ -0,0 +1,52 @@ +package com.fangjia.service.mongo.fangjia; + +import com.fangjia.dal.QueryParam; +import com.fangjia.dal.SortParam; +import com.fangjia.dal.mongo.dao.PropertyStatsIndexDao; +import com.fangjia.dal.mongo.dao.StatsIndexDao; +import com.fangjia.dal.mongo.model.PropertyStatsIndex; +import com.fangjia.dal.mongo.model.StatsIndex; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +public class PropertyStatsIndexServiceImpl implements PropertyStatsIndexService { + private PropertyStatsIndexDao propertyStatsIndexDao; + + @Override + public PropertyStatsIndex findById(String id) { + return propertyStatsIndexDao.findById(id); + } + + @Override + public PropertyStatsIndex findStatsIndex(String city, String district, String name, String yearmonth, String cat) { + List params = new ArrayList(); + if (StringUtils.isNotBlank(city)) { + params.add(new QueryParam("city", city)); + } + if (StringUtils.isNotBlank(district)) { + params.add(new QueryParam("district", district)); + } + if (StringUtils.isNotBlank(name)) { + params.add(new QueryParam("name", name)); + } + if (StringUtils.isNotBlank(yearmonth)) { + params.add(new QueryParam("yearmonth", yearmonth)); + } + if (("ÉÌÆÌ").equals(cat)) { + params.add(new QueryParam("cat", "shop")); + } else if (("д×ÖÂ¥").equals(cat)) { + params.add(new QueryParam("cat", "office")); + } else { + params.add(new QueryParam("cat", "district")); + } + List sortParams = new ArrayList(); + sortParams.add(new SortParam("yearmonth", false)); + return propertyStatsIndexDao.findFirstByParams(params, sortParams); + } + + public void setPropertyStatsIndexDao(PropertyStatsIndexDao propertyStatsIndexDao) { + this.propertyStatsIndexDao = propertyStatsIndexDao; + } +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/StatsIndexService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/StatsIndexService.java index 2e048b298..16da71c9e 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/StatsIndexService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/StatsIndexService.java @@ -11,13 +11,15 @@ public interface StatsIndexService { StatsIndex findByName(String city, String yearmonth); List findAllStats(String city, String yearmonth, boolean order,String cat); - +// List findAllStats(String city, String district,String type, String yearmonth, boolean order,String cat); + int findAllStatsCount(String city, String name,String cat); void deleteById(String id); StatsIndex findLatestStstsIndex(String city, String yearmonth,String cat); - + StatsIndex findStatsIndex(String city,String district,String type,String name, String yearmonth,String cat); + public List findAllStatsNocat(String yearmonth,String cat,String source) ; Integer findEarliestMonth(String city, String cat, String source); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/StatsIndexServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/StatsIndexServiceImpl.java index 7cb8ee88a..2530942c6 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/StatsIndexServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/StatsIndexServiceImpl.java @@ -42,8 +42,7 @@ public class StatsIndexServiceImpl implements StatsIndexService { } @Override - public List findAllStats(String city, String yearmonth, - boolean order, String cat) { + public List findAllStats(String city, String yearmonth, boolean order, String cat) { List params = new ArrayList(); if (StringUtils.isNotBlank(city)) { params.add(new QueryParam("city", city)); @@ -124,7 +123,35 @@ public class StatsIndexServiceImpl implements StatsIndexService { return statsIndexDao.findFirstByParams(params, sortParams); } - + @Override + public StatsIndex findStatsIndex(String city, String district, String type, String name, String yearmonth, String cat) { + List params = new ArrayList(); + if (StringUtils.isNotBlank(city)) { + params.add(new QueryParam("city", city)); + } + if (StringUtils.isNotBlank(district)) { + params.add(new QueryParam("district", district)); + } + if (StringUtils.isNotBlank(type)) { + params.add(new QueryParam("type", type)); + } + if (StringUtils.isNotBlank(name)) { + params.add(new QueryParam("name", name)); + } + if (StringUtils.isNotBlank(yearmonth)) { + params.add(new QueryParam("yearmonth", yearmonth)); + } + if (("ÉÌÆÌ").equals(cat)) { + params.add(new QueryParam("cat", "shop")); + } else if (("д×ÖÂ¥").equals(cat)) { + params.add(new QueryParam("cat", "office")); + } else { + params.add(new QueryParam("cat", "district")); + } + List sortParams = new ArrayList(); + sortParams.add(new SortParam("yearmonth", false)); + return statsIndexDao.findFirstByParams(params, sortParams); + } @Override