From 7047b18b0e12f79acfdfd957d78cb328bc1ec37a Mon Sep 17 00:00:00 2001 From: majintao Date: Fri, 27 Sep 2024 09:57:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=8E=E5=B8=82=E3=80=81=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E3=80=81=E5=B0=8F=E5=8C=BA=E4=BB=B7=E6=A0=BC=E6=8C=87=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mongo/model/PropertyStatsIndex.java | 10 +- .../fangjia/dal/mongo/model/StatsIndex.java | 8 +- .../open/controllers/HouseController.java | 2 +- .../controllers/StatsIndexController.java | 24 +- .../fangjia/open/model/StatsIndexModel.java | 6 +- .../fangjia/PropertyStatsIndexService.java | 2 +- .../PropertyStatsIndexServiceImpl.java | 11 +- .../mongo/fangjia/StatsIndexService.java | 12 +- .../mongo/fangjia/StatsIndexServiceImpl.java | 321 +++++++++--------- 9 files changed, 193 insertions(+), 203 deletions(-) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PropertyStatsIndex.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PropertyStatsIndex.java index 71076ab65..923e94247 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PropertyStatsIndex.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/PropertyStatsIndex.java @@ -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; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/StatsIndex.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/StatsIndex.java index 066c5f424..3dd495898 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/StatsIndex.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/StatsIndex.java @@ -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; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java index f3548c9cc..f0a5f24dd 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java @@ -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); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/StatsIndexController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/StatsIndexController.java index 4f6fd841f..5e2514098 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/StatsIndexController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/StatsIndexController.java @@ -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 resMap = new HashMap(); - 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); 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 3d9a4909c..305d4f6fe 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 @@ -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; } 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 index dfd0645bc..e4399d1bc 100644 --- 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 @@ -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); } 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 index 73bea049a..191b5437b 100644 --- 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 @@ -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 params = new ArrayList(); 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 sortParams = new ArrayList(); sortParams.add(new SortParam("yearmonth", false)); return propertyStatsIndexDao.findFirstByParams(params, sortParams); 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 16da71c9e..55c6bfc7e 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 @@ -8,19 +8,19 @@ public interface StatsIndexService { StatsIndex findById(String id); - StatsIndex findByName(String city, String yearmonth); + StatsIndex findByName(String city, Integer yearmonth); - List findAllStats(String city, String yearmonth, boolean order,String cat); + List findAllStats(String city, Integer 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); + 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 findAllStatsNocat(String yearmonth,String cat,String source) ; + public List findAllStatsNocat(Integer 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 2530942c6..915e63544 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 @@ -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 params = new ArrayList(1); - if (StringUtils.isNotEmpty(city)) { - params.add(new QueryParam("city", city)); - } - if (StringUtils.isNotEmpty(city)) { - params.add(new QueryParam("yearmonth", yearmonth)); - } - List allNearbys = statsIndexDao.findAllByParams(params, - null, 0, Integer.MAX_VALUE); - return allNearbys.get(0); - } + @Override + public StatsIndex findByName(String city, Integer yearmonth) { + List params = new ArrayList(1); + if (StringUtils.isNotEmpty(city)) { + params.add(new QueryParam("city", city)); + } + if (null != yearmonth) { + params.add(new QueryParam("yearmonth", yearmonth)); + } + List allNearbys = statsIndexDao.findAllByParams(params, + null, 0, Integer.MAX_VALUE); + return allNearbys.get(0); + } - @Override - 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)); - } - 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(2); - sortParams.add(new SortParam("yearmonth", order)); - sortParams.add(new SortParam("cDate", order)); - List allNearbys = statsIndexDao.findAllByParams(params,sortParams); - return allNearbys; - } + @Override + public List findAllStats(String city, Integer yearmonth, boolean order, String cat) { + List params = new ArrayList(); + 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 sortParams = new ArrayList(2); + sortParams.add(new SortParam("yearmonth", order)); + sortParams.add(new SortParam("cDate", order)); + List allNearbys = statsIndexDao.findAllByParams(params, sortParams); + return allNearbys; + } - private List createQueryParam(String city, String yearmonth) { - List params = new ArrayList(); - if (StringUtils.isNotBlank(city)) { - params.add(new QueryParam("city", city)); - } - if (StringUtils.isNotBlank(yearmonth)) { - params.add(new QueryParam("yearmonth", yearmonth)); - } - return params; - } + private List createQueryParam(String city, Integer yearmonth) { + List params = new ArrayList(); + 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 params = new ArrayList(); - 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 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 params = new ArrayList(); + 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 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 params = new ArrayList(); - 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 sortParams = new ArrayList(); - sortParams.add(new SortParam("yearmonth", false)); - return statsIndexDao.findFirstByParams(params, sortParams); - } + @Override + public StatsIndex findLatestStstsIndex(String city, Integer yearmonth, String cat) { + List params = new ArrayList(); + 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 sortParams = new ArrayList(); + 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 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 + public StatsIndex findStatsIndex(String city, String district, String type, String name, Integer 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 (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 sortParams = new ArrayList(); + sortParams.add(new SortParam("yearmonth", false)); + return statsIndexDao.findFirstByParams(params, sortParams); + } - @Override - public List findAllStatsNocat(String yearmonth,String cat,String source) { - List params = new ArrayList(); - 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 sortParams = new ArrayList(2); - List allNearbys = statsIndexDao.findAllByParams(params, - sortParams); - return allNearbys; - } + @Override + public List findAllStatsNocat(Integer yearmonth, String cat, String source) { + List params = new ArrayList(); + 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 sortParams = new ArrayList(2); + List allNearbys = statsIndexDao.findAllByParams(params, + sortParams); + return allNearbys; + } - @Override - public Integer findEarliestMonth(String city, String cat, String source) { - List params = new ArrayList(); - 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 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 params = new ArrayList(); + 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 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; + } }