城市、区域、小区价格指数

This commit is contained in:
majintao
2024-09-27 09:57:29 +08:00
parent cce35a9c62
commit 7047b18b0e
9 changed files with 193 additions and 203 deletions
@@ -24,7 +24,7 @@ public class PropertyStatsIndex implements MongoEntity{
private String name;
private String yearmonth;
private Integer yearmonth;
private Integer source;
@@ -109,16 +109,16 @@ public class PropertyStatsIndex implements MongoEntity{
public void setcDate(Date cDate) {
this.cDate = cDate;
}
@Column(name = "yearmonth")
public String getYearmonth() {
public Integer getYearmonth() {
return yearmonth;
}
public void setYearmonth(String yearmonth) {
public void setYearmonth(Integer yearmonth) {
this.yearmonth = yearmonth;
}
@Column(name = "source")
public Integer getSource() {
return source;
@@ -27,7 +27,7 @@ public class StatsIndex implements MongoEntity{
private String district;
private String yearmonth;
private Integer yearmonth;
private Integer source;
@@ -106,13 +106,13 @@ public class StatsIndex implements MongoEntity{
public void setcDate(Date cDate) {
this.cDate = cDate;
}
@Column(name = "yearmonth")
public String getYearmonth() {
public Integer getYearmonth() {
return yearmonth;
}
public void setYearmonth(String yearmonth) {
public void setYearmonth(Integer yearmonth) {
this.yearmonth = yearmonth;
}
@@ -1170,7 +1170,7 @@ public class HouseController {
|| statsIndex.getBelowFixedbase() == null) {
return null;
}
Date endDate = DateUtil.parseDate(statsIndex.getYearmonth(), "yyyyMM");
Date endDate = DateUtil.parseDate(statsIndex.getYearmonth().toString(), "yyyyMM");
Calendar c = Calendar.getInstance();
c.setTime(endDate);
c.add(Calendar.MONTH, -1);
@@ -51,7 +51,7 @@ public class StatsIndexController {
mav.setModel(BasicModel.buildBadRequestModel("请输入城市编码"));
return mav;
}
if (StringUtils.isBlank(model.getYearmonth())) {
if (null == model.getYearmonth()) {
mav.setModel(BasicModel.buildBadRequestModel("请输入要查询的年月"));
return mav;
}
@@ -106,7 +106,7 @@ public class StatsIndexController {
mav.setModel(BasicModel.buildBadRequestModel("请输入区域编码"));
return mav;
}
if (StringUtils.isBlank(model.getYearmonth())) {
if (null == model.getYearmonth()) {
mav.setModel(BasicModel.buildBadRequestModel("请输入要查询的年月"));
return mav;
}
@@ -147,7 +147,7 @@ public class StatsIndexController {
mav.setModel(BasicModel.buildBadRequestModel("请输入小区id"));
return mav;
}
if (StringUtils.isBlank(model.getYearmonth())) {
if (null == model.getYearmonth()) {
mav.setModel(BasicModel.buildBadRequestModel("请输入要查询的年月"));
return mav;
}
@@ -157,7 +157,7 @@ public class StatsIndexController {
return mav;
}
Map<String, Object> resMap = new HashMap<String, Object>();
PropertyStatsIndex statsIndex = propertyStatsIndexService.findStatsIndex(district.getCity(), district.getRegion(), district.getName(), model.getYearmonth(), model.getCat());
PropertyStatsIndex statsIndex = propertyStatsIndexService.findStatsIndex(district.getCity(), district.getRegion(), district.getName(), model.getYearmonth());
if (statsIndex != null) {
PropertyStatsIndex newStatsIndex = new PropertyStatsIndex();
newStatsIndex.setChain(statsIndex.getChain());
@@ -191,7 +191,7 @@ public class StatsIndexController {
}
model.setCity(cityName);
}
if (StringUtils.isBlank(model.getYearmonth())) {
if (null == model.getYearmonth()) {
mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "年月必须输入,格式:yyyyMM"));
return mav;
}
@@ -202,7 +202,7 @@ public class StatsIndexController {
for (StatsIndex statsIndex : statsIndexs) {
IndexBo newStatsIndex = new IndexBo();
newStatsIndex.setCity(DistrictCodeUtils.getCityCode(statsIndex.getCity()));
newStatsIndex.setYearmonth(statsIndex.getYearmonth());
newStatsIndex.setYearmonth(statsIndex.getYearmonth().toString());
newStatsIndex.setMOM(statsIndex.getChain());
newStatsIndex.setYOY(statsIndex.getYeartoyear());
newStatsIndex.setFixedBase(statsIndex.getFixedbase());
@@ -242,7 +242,7 @@ public class StatsIndexController {
}
model.setCity(cityName);
}
if (StringUtils.isBlank(model.getYearmonth())) {
if (null == model.getYearmonth()) {
mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "年月必须输入,格式:yyyyMM"));
return mav;
}
@@ -265,7 +265,7 @@ public class StatsIndexController {
newStatsIndex.setLargeFixedBase(statsIndex.getAboveFixedbase());
newStatsIndex.setCity(DistrictCodeUtils.getCityCode(statsIndex.getCity()));
newStatsIndex.setYearmonth(statsIndex.getYearmonth());
newStatsIndex.setYearmonth(statsIndex.getYearmonth().toString());
newStatsIndex.setSource(String.valueOf(statsIndex.getSource()));
if (StringUtils.isNotBlank(newStatsIndex.getCity())) {
statsIndexList.add(newStatsIndex);
@@ -304,7 +304,7 @@ public class StatsIndexController {
}
model.setCity(cityName);
}
if (StringUtils.isBlank(model.getYearmonth())) {
if (null == model.getYearmonth()) {
mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "年月必须输入,格式:yyyyMM"));
return mav;
}
@@ -317,7 +317,7 @@ public class StatsIndexController {
newStatsIndex.setMOM(statsIndex.getFangChain());
newStatsIndex.setIndex(statsIndex.getFangIndex());
newStatsIndex.setCity(DistrictCodeUtils.getCityCode(statsIndex.getCity()));
newStatsIndex.setYearmonth(statsIndex.getYearmonth());
newStatsIndex.setYearmonth(statsIndex.getYearmonth().toString());
newStatsIndex.setSource(String.valueOf(statsIndex.getSource()));
if (StringUtils.isNotBlank(newStatsIndex.getCity())) {
statsIndexList.add(newStatsIndex);
@@ -354,7 +354,7 @@ public class StatsIndexController {
}
model.setCity(cityName);
}
if (StringUtils.isBlank(model.getYearmonth())) {
if (null == model.getYearmonth()) {
mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "年月必须输入,格式:yyyyMM"));
return mav;
}
@@ -368,7 +368,7 @@ public class StatsIndexController {
newStatsIndex.setMOM(statsIndex.getFangChain());
newStatsIndex.setIndex(statsIndex.getFangIndex());
newStatsIndex.setCity(DistrictCodeUtils.getCityCode(statsIndex.getCity()));
newStatsIndex.setYearmonth(statsIndex.getYearmonth());
newStatsIndex.setYearmonth(statsIndex.getYearmonth().toString());
newStatsIndex.setSource(String.valueOf(statsIndex.getSource()));
if (StringUtils.isNotBlank(newStatsIndex.getCity())) {
statsIndexList.add(newStatsIndex);
@@ -14,7 +14,7 @@ public class StatsIndexModel {
private String name;
private String type;
private String yearmonth;
private Integer yearmonth;
private Integer source;
@@ -68,11 +68,11 @@ public class StatsIndexModel {
this.city = city;
}
public String getYearmonth() {
public Integer getYearmonth() {
return yearmonth;
}
public void setYearmonth(String yearmonth) {
public void setYearmonth(Integer yearmonth) {
this.yearmonth = yearmonth;
}
@@ -8,5 +8,5 @@ import java.util.List;
public interface PropertyStatsIndexService {
PropertyStatsIndex findById(String id);
PropertyStatsIndex findStatsIndex(String city, String district, String name, String yearmonth, String cat);
PropertyStatsIndex findStatsIndex(String city, String district, String name, Integer yearmonth);
}
@@ -20,7 +20,7 @@ public class PropertyStatsIndexServiceImpl implements PropertyStatsIndexService
}
@Override
public PropertyStatsIndex findStatsIndex(String city, String district, String name, String yearmonth, String cat) {
public PropertyStatsIndex findStatsIndex(String city, String district, String name, Integer yearmonth) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(city)) {
params.add(new QueryParam("city", city));
@@ -31,16 +31,9 @@ public class PropertyStatsIndexServiceImpl implements PropertyStatsIndexService
if (StringUtils.isNotBlank(name)) {
params.add(new QueryParam("name", name));
}
if (StringUtils.isNotBlank(yearmonth)) {
if (null == 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<SortParam> sortParams = new ArrayList<SortParam>();
sortParams.add(new SortParam("yearmonth", false));
return propertyStatsIndexDao.findFirstByParams(params, sortParams);
@@ -8,19 +8,19 @@ public interface StatsIndexService {
StatsIndex findById(String id);
StatsIndex findByName(String city, String yearmonth);
StatsIndex findByName(String city, Integer yearmonth);
List<StatsIndex> findAllStats(String city, String yearmonth, boolean order,String cat);
List<StatsIndex> findAllStats(String city, Integer yearmonth, boolean order,String cat);
// List<StatsIndex> findAllStats(String city, String district,String type, String yearmonth, boolean order,String cat);
int findAllStatsCount(String city, String name,String cat);
int findAllStatsCount(String city, Integer yearmonth,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);
StatsIndex findLatestStstsIndex(String city, Integer yearmonth,String cat);
StatsIndex findStatsIndex(String city,String district,String type,String name, Integer yearmonth,String cat);
public List<StatsIndex> findAllStatsNocat(String yearmonth,String cat,String source) ;
public List<StatsIndex> findAllStatsNocat(Integer yearmonth,String cat,String source) ;
Integer findEarliestMonth(String city, String cat, String source);
@@ -20,179 +20,176 @@ import com.fangjia.service.cnAnalyzer.CnTokenizer;
import com.fangjia.service.datastore.DistrictService;
public class StatsIndexServiceImpl implements StatsIndexService {
private StatsIndexDao statsIndexDao;
private StatsIndexDao statsIndexDao;
@Override
public StatsIndex findById(String id) {
return statsIndexDao.findById(id);
}
@Override
public StatsIndex findById(String id) {
return statsIndexDao.findById(id);
}
@Override
public StatsIndex findByName(String city, String yearmonth) {
List<QueryParam> params = new ArrayList<QueryParam>(1);
if (StringUtils.isNotEmpty(city)) {
params.add(new QueryParam("city", city));
}
if (StringUtils.isNotEmpty(city)) {
params.add(new QueryParam("yearmonth", yearmonth));
}
List<StatsIndex> allNearbys = statsIndexDao.findAllByParams(params,
null, 0, Integer.MAX_VALUE);
return allNearbys.get(0);
}
@Override
public StatsIndex findByName(String city, Integer yearmonth) {
List<QueryParam> params = new ArrayList<QueryParam>(1);
if (StringUtils.isNotEmpty(city)) {
params.add(new QueryParam("city", city));
}
if (null != yearmonth) {
params.add(new QueryParam("yearmonth", yearmonth));
}
List<StatsIndex> allNearbys = statsIndexDao.findAllByParams(params,
null, 0, Integer.MAX_VALUE);
return allNearbys.get(0);
}
@Override
public List<StatsIndex> findAllStats(String city, String yearmonth, boolean order, String cat) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(city)) {
params.add(new QueryParam("city", city));
}
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<SortParam> sortParams = new ArrayList<SortParam>(2);
sortParams.add(new SortParam("yearmonth", order));
sortParams.add(new SortParam("cDate", order));
List<StatsIndex> allNearbys = statsIndexDao.findAllByParams(params,sortParams);
return allNearbys;
}
@Override
public List<StatsIndex> findAllStats(String city, Integer yearmonth, boolean order, String cat) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(city)) {
params.add(new QueryParam("city", city));
}
if (null != 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<SortParam> sortParams = new ArrayList<SortParam>(2);
sortParams.add(new SortParam("yearmonth", order));
sortParams.add(new SortParam("cDate", order));
List<StatsIndex> allNearbys = statsIndexDao.findAllByParams(params, sortParams);
return allNearbys;
}
private List<QueryParam> createQueryParam(String city, String yearmonth) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(city)) {
params.add(new QueryParam("city", city));
}
if (StringUtils.isNotBlank(yearmonth)) {
params.add(new QueryParam("yearmonth", yearmonth));
}
return params;
}
private List<QueryParam> createQueryParam(String city, Integer yearmonth) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(city)) {
params.add(new QueryParam("city", city));
}
if (null != yearmonth) {
params.add(new QueryParam("yearmonth", yearmonth));
}
return params;
}
@Override
public int findAllStatsCount(String city, String yearmonth, String cat) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(city)) {
params.add(new QueryParam("city", city));
}
if (StringUtils.isNotBlank(yearmonth)) {
params.add(new QueryParam("yearmonth", yearmonth));
}
if (StringUtils.isNotBlank(cat)) {
params.add(new QueryParam("cat", cat));
} else {
params.add(new QueryParam("cat", "district"));
}
List<StatsIndex> allNearbys = statsIndexDao.findAllByParams(params);
if (allNearbys.size() == 0) {
allNearbys = statsIndexDao.findAllByParams(createQueryParam(city,
yearmonth));
}
return allNearbys.size();
}
@Override
public int findAllStatsCount(String city, Integer yearmonth, String cat) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(city)) {
params.add(new QueryParam("city", city));
}
if (null != yearmonth) {
params.add(new QueryParam("yearmonth", yearmonth));
}
if (StringUtils.isNotBlank(cat)) {
params.add(new QueryParam("cat", cat));
} else {
params.add(new QueryParam("cat", "district"));
}
List<StatsIndex> allNearbys = statsIndexDao.findAllByParams(params);
if (allNearbys.size() == 0) {
allNearbys = statsIndexDao.findAllByParams(createQueryParam(city,
yearmonth));
}
return allNearbys.size();
}
@Override
public void deleteById(String id) {
statsIndexDao.deleteById(id);
}
@Override
public void deleteById(String id) {
statsIndexDao.deleteById(id);
}
public void setStatsIndexDao(StatsIndexDao statsIndexDao) {
this.statsIndexDao = statsIndexDao;
}
public void setStatsIndexDao(StatsIndexDao statsIndexDao) {
this.statsIndexDao = statsIndexDao;
}
@Override
public StatsIndex findLatestStstsIndex(String city, String yearmonth, String cat) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(city)) {
params.add(new QueryParam("city", city));
}
if (StringUtils.isNotBlank(yearmonth)) {
params.add(new QueryParam("yearmonth", yearmonth));
}
if(StringUtils.isNotBlank(cat)){
params.add(new QueryParam("cat", cat));
}
List<SortParam> sortParams = new ArrayList<SortParam>();
sortParams.add(new SortParam("yearmonth", false));
return statsIndexDao.findFirstByParams(params, sortParams);
}
@Override
public StatsIndex findLatestStstsIndex(String city, Integer yearmonth, String cat) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(city)) {
params.add(new QueryParam("city", city));
}
if (null != yearmonth) {
params.add(new QueryParam("yearmonth", yearmonth));
}
if (StringUtils.isNotBlank(cat)) {
params.add(new QueryParam("cat", cat));
}
List<SortParam> sortParams = new ArrayList<SortParam>();
sortParams.add(new SortParam("yearmonth", false));
return statsIndexDao.findFirstByParams(params, sortParams);
}
@Override
public StatsIndex findStatsIndex(String city, String district, String type, String name, String yearmonth, String cat) {
List<QueryParam> params = new ArrayList<QueryParam>();
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<SortParam> sortParams = new ArrayList<SortParam>();
sortParams.add(new SortParam("yearmonth", false));
return statsIndexDao.findFirstByParams(params, sortParams);
}
@Override
public StatsIndex findStatsIndex(String city, String district, String type, String name, Integer yearmonth, String cat) {
List<QueryParam> params = new ArrayList<QueryParam>();
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 (null != 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<SortParam> sortParams = new ArrayList<SortParam>();
sortParams.add(new SortParam("yearmonth", false));
return statsIndexDao.findFirstByParams(params, sortParams);
}
@Override
public List<StatsIndex> findAllStatsNocat(String yearmonth,String cat,String source) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(yearmonth)) {
params.add(new QueryParam("yearmonth", yearmonth));
}
if(StringUtils.isNotBlank(cat)){
params.add(new QueryParam("cat", cat));
}
if(StringUtils.isNotBlank(source)){
params.add(new QueryParam("source", Integer.valueOf(source)));
}
List<SortParam> sortParams = new ArrayList<SortParam>(2);
List<StatsIndex> allNearbys = statsIndexDao.findAllByParams(params,
sortParams);
return allNearbys;
}
@Override
public List<StatsIndex> findAllStatsNocat(Integer yearmonth, String cat, String source) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (null != yearmonth) {
params.add(new QueryParam("yearmonth", yearmonth));
}
if (StringUtils.isNotBlank(cat)) {
params.add(new QueryParam("cat", cat));
}
if (StringUtils.isNotBlank(source)) {
params.add(new QueryParam("source", Integer.valueOf(source)));
}
List<SortParam> sortParams = new ArrayList<SortParam>(2);
List<StatsIndex> allNearbys = statsIndexDao.findAllByParams(params,
sortParams);
return allNearbys;
}
@Override
public Integer findEarliestMonth(String city, String cat, String source) {
List<QueryParam> params = new ArrayList<QueryParam>();
if(StringUtils.isNotBlank(cat)){
params.add(new QueryParam("cat", cat));
}
if(StringUtils.isNotBlank(source)){
params.add(new QueryParam("source", Integer.valueOf(source)));
}
if(StringUtils.isNotBlank(city)){
params.add(new QueryParam("city", city));
}
List<StatsIndex> statsIndexList = statsIndexDao.findAllByParams(params, null, 0, Integer.MAX_VALUE, new String[]{"yearmonth"});
Integer min = null;
for(StatsIndex statsIndex : statsIndexList){
Integer yearMonth = Integer.valueOf(statsIndex.getYearmonth());
if(min == null || yearMonth < min){
min = yearMonth;
}
}
return min;
}
@Override
public Integer findEarliestMonth(String city, String cat, String source) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(cat)) {
params.add(new QueryParam("cat", cat));
}
if (StringUtils.isNotBlank(source)) {
params.add(new QueryParam("source", Integer.valueOf(source)));
}
if (StringUtils.isNotBlank(city)) {
params.add(new QueryParam("city", city));
}
List<StatsIndex> statsIndexList = statsIndexDao.findAllByParams(params, null, 0, Integer.MAX_VALUE, new String[]{"yearmonth"});
Integer min = null;
for (StatsIndex statsIndex : statsIndexList) {
Integer yearMonth = Integer.valueOf(statsIndex.getYearmonth());
if (min == null || yearMonth < min) {
min = yearMonth;
}
}
return min;
}
}