diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java index 15176face..88cd97297 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java @@ -6,6 +6,7 @@ import javax.persistence.*; import com.fangjia.dal.DatastoreCategory; import com.fangjia.dal.SeawaterEntity; +import com.fasterxml.jackson.annotation.JsonInclude; @Entity @Table(name = "fangjia.seawater") @@ -35,9 +36,11 @@ public class Seawater implements SeawaterEntity { private String id; private String category; + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private int status; private String city; private String region; + private String district; private String districtName; private String address; private Date modificationDate; @@ -46,8 +49,10 @@ public class Seawater implements SeawaterEntity { private String block; private Integer totalPrice; private Double area; + private Double size; private Integer height; private Integer floor; + private Integer maxFloor; private String floorInfo; private String fitment; private Integer room; @@ -55,10 +60,13 @@ public class Seawater implements SeawaterEntity { private Integer toilet; private String mobile; private Integer pDate; + + private String publishDate; private Integer userId; private String url; private String root; private Integer avgPrice; + private Integer unitPrice; private String purpose; private String estateType; private String buildType; @@ -70,6 +78,8 @@ public class Seawater implements SeawaterEntity { private String housingAge; //房屋年限 满二年 private String elevator; //配备电梯 有/无 + private String decoration; + @Id @Column(name = "_id") public String getId() { @@ -395,4 +405,52 @@ public class Seawater implements SeawaterEntity { public void setElevator(String elevator) { this.elevator = elevator; } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public Double getSize() { + return size; + } + + public void setSize(Double size) { + this.size = size; + } + + public Integer getMaxFloor() { + return maxFloor; + } + + public void setMaxFloor(Integer maxFloor) { + this.maxFloor = maxFloor; + } + + public Integer getUnitPrice() { + return unitPrice; + } + + public void setUnitPrice(Integer unitPrice) { + this.unitPrice = unitPrice; + } + + public String getPublishDate() { + return publishDate; + } + + public void setPublishDate(String publishDate) { + this.publishDate = publishDate; + } + + public String getDecoration() { + return decoration; + } + + public void setDecoration(String decoration) { + this.decoration = decoration; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/Seaweed.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/Seaweed.java index daa27c20e..6fbd24813 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/Seaweed.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/Seaweed.java @@ -24,6 +24,8 @@ public class Seaweed implements SeaweedEntity { private List alias; private List addrAlias; + private double score; + @Id @GeneratedValue(strategy = GenerationType.AUTO) @Column(name = "_id") @@ -134,4 +136,13 @@ public class Seaweed implements SeaweedEntity { public void setEstateType2(String estateType2) { this.estateType2 = estateType2; } + + @Transient + public double getScore() { + return score; + } + + public void setScore(double score) { + this.score = score; + } } 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 f0a5f24dd..c74fe5bd9 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 @@ -14,6 +14,7 @@ import com.fangjia.dal.mongo.model.StatsIndex; import com.fangjia.dal.seawater.dao.SeawaterDao; import com.fangjia.dal.seawater.model.Seawater; import com.fangjia.dal.seaweed.model.District; +import com.fangjia.dal.seaweed.model.Seaweed; import com.fangjia.dal.sql.model.ApiUser; import com.fangjia.datastore.driver.FacetResult; import com.fangjia.open.FangjiaApiUtil; @@ -38,10 +39,7 @@ import com.fangjia.service.bo.Collateral; import com.fangjia.service.bo.DistrictStatBo; import com.fangjia.service.bo.Sample; import com.fangjia.service.bo.ShopSample; -import com.fangjia.service.datastore.CzbankSampleService; -import com.fangjia.service.datastore.DistrictService; -import com.fangjia.service.datastore.HouseService; -import com.fangjia.service.datastore.NoHouseDistrictService; +import com.fangjia.service.datastore.*; import com.fangjia.service.datastore.bean.CollateralSampleQueryBean; import com.fangjia.service.datastore.bean.ShopCollateralSampleQueryBean; import com.fangjia.service.district.DistrictFacilitysService; @@ -70,333 +68,336 @@ import java.io.IOException; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; + @Authority(role = Role.USER) public class HouseController { - private AddressParser addressParser; - private HouseService houseService; - private MenuService menuService; - private NoHouseDistrictService noHouseDistrictService; - private ApiUserService apiUserService; - private UserService userService; - private DistrictStatService districtStatService; - private DistrictFacilitysService districtFacilitysService; - private MetroService metroService; - private StatsIndexService statsIndexService; - private static final int HOUSE_DELETE_STATUS = 1; - private static long MAX_PIC_SIZE = 2 * 1024 * 1024; - private FileDao fileDao = FileDao.getInstance(); - public static final Map ESTATE_TYPE_CODE = new HashMap(); - public static final Map BULIDS_TYPE_CODE = new HashMap(); - public static final Map DIRECTION_CODE = new HashMap(); - public static final Map FITMENT_CODE = new HashMap(); - private static final Map STATS_INDEX_LATEST_DATE_CACHE = new HashMap(); - private static String CACHE_REFRESH_FLAG = null; - private CzbankSampleService czbankSampleService; - private DistrictService districtService; - private FangjiaOfficialAreaService fangjiaOfficialAreaService; + private AddressParser addressParser; + private HouseService houseService; + private MenuService menuService; + private NoHouseDistrictService noHouseDistrictService; + private ApiUserService apiUserService; + private UserService userService; + private DistrictStatService districtStatService; + private DistrictFacilitysService districtFacilitysService; + private MetroService metroService; + private StatsIndexService statsIndexService; + private static final int HOUSE_DELETE_STATUS = 1; + private static long MAX_PIC_SIZE = 2 * 1024 * 1024; + private FileDao fileDao = FileDao.getInstance(); + public static final Map ESTATE_TYPE_CODE = new HashMap(); + public static final Map BULIDS_TYPE_CODE = new HashMap(); + public static final Map DIRECTION_CODE = new HashMap(); + public static final Map FITMENT_CODE = new HashMap(); + private static final Map STATS_INDEX_LATEST_DATE_CACHE = new HashMap(); + private static String CACHE_REFRESH_FLAG = null; + private CzbankSampleService czbankSampleService; + private DistrictService districtService; + private FangjiaOfficialAreaService fangjiaOfficialAreaService; - private SeawaterService seawaterService; - private SeawaterDao seawaterDao; - private List PROPERTY_TYPE_CODE_LIST = Arrays.asList("01", "02"); + private SeawaterService seawaterService; + private SeawaterDao seawaterDao; + + private SeaweedService seaweedService; + private List PROPERTY_TYPE_CODE_LIST = Arrays.asList("01", "02"); - static { - ESTATE_TYPE_CODE.put("普通住宅", "1"); - ESTATE_TYPE_CODE.put("别墅", "2"); - ESTATE_TYPE_CODE.put("商住", "3"); + static { + ESTATE_TYPE_CODE.put("普通住宅", "1"); + ESTATE_TYPE_CODE.put("别墅", "2"); + ESTATE_TYPE_CODE.put("商住", "3"); - BULIDS_TYPE_CODE.put("多层", "10"); - BULIDS_TYPE_CODE.put("小高层", "11"); - BULIDS_TYPE_CODE.put("超高层", "12"); - BULIDS_TYPE_CODE.put("高层", "13"); - BULIDS_TYPE_CODE.put("花园洋房", "14"); - BULIDS_TYPE_CODE.put("老洋房", "15"); - BULIDS_TYPE_CODE.put("四合院", "16"); - BULIDS_TYPE_CODE.put("独栋", "17"); - BULIDS_TYPE_CODE.put("双拼", "18"); - BULIDS_TYPE_CODE.put("联排", "19"); - BULIDS_TYPE_CODE.put("叠加", "20"); + BULIDS_TYPE_CODE.put("多层", "10"); + BULIDS_TYPE_CODE.put("小高层", "11"); + BULIDS_TYPE_CODE.put("超高层", "12"); + BULIDS_TYPE_CODE.put("高层", "13"); + BULIDS_TYPE_CODE.put("花园洋房", "14"); + BULIDS_TYPE_CODE.put("老洋房", "15"); + BULIDS_TYPE_CODE.put("四合院", "16"); + BULIDS_TYPE_CODE.put("独栋", "17"); + BULIDS_TYPE_CODE.put("双拼", "18"); + BULIDS_TYPE_CODE.put("联排", "19"); + BULIDS_TYPE_CODE.put("叠加", "20"); - DIRECTION_CODE.put("西北", "1"); - DIRECTION_CODE.put("北", "1"); - DIRECTION_CODE.put("东", "2"); - DIRECTION_CODE.put("西", "2"); - DIRECTION_CODE.put("东西", "2"); - DIRECTION_CODE.put("南", "3"); - DIRECTION_CODE.put("东南", "3"); - DIRECTION_CODE.put("南北", "3"); - DIRECTION_CODE.put("东北", "4"); - DIRECTION_CODE.put("西南", "5"); + DIRECTION_CODE.put("西北", "1"); + DIRECTION_CODE.put("北", "1"); + DIRECTION_CODE.put("东", "2"); + DIRECTION_CODE.put("西", "2"); + DIRECTION_CODE.put("东西", "2"); + DIRECTION_CODE.put("南", "3"); + DIRECTION_CODE.put("东南", "3"); + DIRECTION_CODE.put("南北", "3"); + DIRECTION_CODE.put("东北", "4"); + DIRECTION_CODE.put("西南", "5"); - FITMENT_CODE.put("毛坯", "1"); - FITMENT_CODE.put("简装", "1"); - FITMENT_CODE.put("精装", "2"); - FITMENT_CODE.put("全装修", "3"); + FITMENT_CODE.put("毛坯", "1"); + FITMENT_CODE.put("简装", "1"); + FITMENT_CODE.put("精装", "2"); + FITMENT_CODE.put("全装修", "3"); - } + } - public static final String[] INCLUDE_DISTRICT_FIELDS = { - "id", "city", "region", "name", "address","estateType2", "alias", - "estateCharge", "virescencePercent", "cubagePercent", - "houseProperty","buildType","lat","lng","lat2","lng2", - "buildDate","finishBuildingDate","liveDate","propertyLife","block","openDate" - }; + public static final String[] INCLUDE_DISTRICT_FIELDS = { + "id", "city", "region", "name", "address", "estateType2", "alias", + "estateCharge", "virescencePercent", "cubagePercent", + "houseProperty", "buildType", "lat", "lng", "lat2", "lng2", + "buildDate", "finishBuildingDate", "liveDate", "propertyLife", "block", "openDate" + }; - private static final String[] INCLUDE_HOUSE_FIELDS = { - "id", "room", "hall", "toilet", "totalPrice", "area", "region", - "block", "city", "estateType", "direction", "height", "fitment", "floor", "districtName", - "address", "publishDate", "url"}; + private static final String[] INCLUDE_HOUSE_FIELDS = { + "id", "room", "hall", "toilet", "totalPrice", "area", "region", + "block", "city", "estateType", "direction", "height", "fitment", "floor", "districtName", + "address", "publishDate", "url"}; + public Object publishAction(@Valid HousePublishModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (model.getImage() == null || model.getImage().length == 0) { + mav.setModel(BasicModel.buildBadRequestModel("图片不能为空")); + return mav; + } + MultipartFile[] images = model.getImage(); + for (int i = 0; i < images.length; i++) { + MultipartFile img = images[i]; + if (img.getSize() > MAX_PIC_SIZE) { + mav.setModel(BasicModel.buildBadRequestModel("图片过大")); + return mav; + } + } + + Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); + String userId = tokenMap.get("userid"); + House house = createHouse(model, Integer.valueOf(userId)); + if (StringUtils.isNotBlank(house.getId())) { + if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { + mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); + return mav; + } + House dbHouse = houseService.findHouseById(model.getId()); + if (dbHouse == null) { + mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); + return mav; + } + if (!userId.equals(dbHouse.getUserId().toString())) { + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限修改该房源")); + return mav; + } + for (String pic : dbHouse.getPics()) {//删除过时的房源图片 + fileDao.delete(pic, "user_house", "o"); + fileDao.delete(pic, "user_house", "s"); + fileDao.delete(pic, "user_house", "m"); + } + } + houseService.saveHouse(house); + List urls = new ArrayList(); + for (int i = 0; i < images.length && i < 8; i++) { + MultipartFile img = images[i]; + try { + String url = userId + "/" + house.getId() + "/api/" + img.getOriginalFilename(); + url = getPicUrl(url, urls); + fileDao.save(url, "user_house", "o", img.getBytes(), img.getContentType()); + fileDao.save(url, "user_house", "s", img.getBytes(), img.getContentType()); + fileDao.save(url, "user_house", "m", img.getBytes(), img.getContentType()); + } catch (IOException e) { + e.printStackTrace(); + } + } + house.setPics(urls); + houseService.updateUserHousePics(urls, house.getId(), Integer.valueOf(userId), "api"); + mav.setModel(BasicModel.buildOKModel().setResult(new HouseDto(house))); + return mav; + + } + + @Authority(role = Role.USER) + public Object similarAction(@Valid CollateralSampleQuery collateralSampleQuery) { + + RestfulModelAndView mav = new RestfulModelAndView(); + List querys = null; + try { + querys = convertQueryToBean(collateralSampleQuery); + } catch (Exception e) { + mav.setModel(BasicModel.buildBadRequestModel(e.getMessage())); + return mav; + } + if (null == collateralSampleQuery.getMax()) { + collateralSampleQuery.setMax(3); + } + List collaterals = czbankSampleService.findSample(querys, collateralSampleQuery.getMax()); + Collateral collateral = collaterals.get(0); + for (Sample sample : collateral.getSample()) { + if (querys.size() > 0 && querys.get(0).getProperty() != null) { + District district = querys.get(0).getProperty(); + if (district != null) { + sample.setHouseUseLimit(DataUtil.extractPrice(district.getPropertyLife())); + if (sample.getHouseUseLimit() == null && !Arrays.asList("成都", "重庆").contains(district.getCity())) { + if (district.getEstateType2() != null && district.getEstateType2().contains("商住")) { + sample.setHouseUseLimit(50); + } else { + sample.setHouseUseLimit(70); + } + } + if (sample.getHouseUseLimit() != null && sample.getCompleteDate() != null) { + Integer houseHadUsed = DateUtil.getYear(new Date()) - Integer.valueOf(sample.getCompleteDate().substring(0, 4)); + sample.setHouseHadUsed(houseHadUsed); + sample.setBuildingRemainLife(sample.getHouseUseLimit() - sample.getHouseHadUsed()); + } else { + sample.setHouseHadUsed(null); + sample.setBuildingRemainLife(null); + } + } + } + } + mav.setModel(BasicModel.buildOKModel().setResult(collateral.getSample())); + return mav; + } - public Object publishAction(@Valid HousePublishModel model){ - - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if(model.getImage() == null || model.getImage().length == 0){ - mav.setModel(BasicModel.buildBadRequestModel("图片不能为空")); - return mav; - } - MultipartFile[] images = model.getImage(); - for (int i = 0; i < images.length; i++) { - MultipartFile img = images[i]; - if(img.getSize() > MAX_PIC_SIZE){ - mav.setModel(BasicModel.buildBadRequestModel("图片过大")); - return mav; - } - } - - Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); - String userId = tokenMap.get("userid"); - House house = createHouse(model,Integer.valueOf(userId)); - if(StringUtils.isNotBlank(house.getId())){ - if(StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); - return mav; - } - House dbHouse = houseService.findHouseById(model.getId()); - if(dbHouse == null){ - mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); - return mav; - } - if(!userId.equals(dbHouse.getUserId().toString())){ - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限修改该房源")); - return mav; - } - for(String pic : dbHouse.getPics()){//删除过时的房源图片 - fileDao.delete(pic,"user_house","o"); - fileDao.delete(pic,"user_house","s"); - fileDao.delete(pic,"user_house","m"); - } - } - houseService.saveHouse(house); - List urls = new ArrayList(); - for (int i = 0; i < images.length && i < 8; i++) { - MultipartFile img = images[i]; - try { - String url = userId + "/" + house.getId() + "/api/" + img.getOriginalFilename(); - url = getPicUrl(url,urls); - fileDao.save(url, "user_house", "o" ,img.getBytes(),img.getContentType()); - fileDao.save(url, "user_house", "s" ,img.getBytes(),img.getContentType()); - fileDao.save(url, "user_house", "m" ,img.getBytes(),img.getContentType()); - } catch (IOException e) { - e.printStackTrace(); - } - } - house.setPics(urls); - houseService.updateUserHousePics(urls, house.getId(), Integer.valueOf(userId), "api"); - mav.setModel(BasicModel.buildOKModel().setResult(new HouseDto(house))); - return mav; - - } - - @Authority(role = Role.USER) - public Object similarAction(@Valid CollateralSampleQuery collateralSampleQuery){ - - RestfulModelAndView mav = new RestfulModelAndView(); - List querys = null; - try{ - querys = convertQueryToBean(collateralSampleQuery); - }catch (Exception e){ - mav.setModel(BasicModel.buildBadRequestModel(e.getMessage())); - return mav; - } - if(null == collateralSampleQuery.getMax()){ - collateralSampleQuery.setMax(3); - } - List collaterals = czbankSampleService.findSample(querys, collateralSampleQuery.getMax()); - Collateral collateral = collaterals.get(0); - for(Sample sample : collateral.getSample()){ - if(querys.size() > 0 && querys.get(0).getProperty() != null){ - District district = querys.get(0).getProperty(); - if(district != null){ - sample.setHouseUseLimit(DataUtil.extractPrice(district.getPropertyLife())); - if(sample.getHouseUseLimit() == null && !Arrays.asList("成都", "重庆").contains(district.getCity())){ - if(district.getEstateType2() != null && district.getEstateType2().contains("商住")){ - sample.setHouseUseLimit(50); - }else{ - sample.setHouseUseLimit(70); - } - } - if(sample.getHouseUseLimit() != null && sample.getCompleteDate() != null){ - Integer houseHadUsed = DateUtil.getYear(new Date()) - Integer.valueOf(sample.getCompleteDate().substring(0, 4)); - sample.setHouseHadUsed(houseHadUsed); - sample.setBuildingRemainLife(sample.getHouseUseLimit() - sample.getHouseHadUsed()); - }else { - sample.setHouseHadUsed(null); - sample.setBuildingRemainLife(null); - } - } - } - } - mav.setModel(BasicModel.buildOKModel().setResult(collateral.getSample())); - return mav; - } + /** + * 商铺相似房源接口 + */ + @Authority(role = Role.USER) + public Object shopSimilarAction(@Valid ShopCollateralSampleQuery query) { + RestfulModelAndView mav = new RestfulModelAndView(); + ShopCollateralSampleQueryBean queryBean = new ShopCollateralSampleQueryBean(); + BeanUtils.copyProperties(query, queryBean); + FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(queryBean.getDistrict()); + if (fangjiaOfficialAreaMap == null) { + String msg = "地区信息无法映射到房价网的地区信息->(province:" + queryBean.getProvince() + " ,city: " + queryBean.getCity() + " ,district: " + queryBean.getDistrict() + ")"; + mav.setModel(BasicModel.buildBadRequestModel(msg)); + return mav; + } + queryBean.setFangjiaCity(fangjiaOfficialAreaMap.getFangjiaCity()); + queryBean.setFangjiaDistrict(fangjiaOfficialAreaMap.getFangjiaDistrict()); + District property = districtService.findByNameAndAlias(queryBean.getFangjiaCity(), queryBean.getFangjiaDistrict(), queryBean.getBuildingName(), "shop"); + if (property == null) { + mav.setModel(BasicModel.buildBadRequestModel("未找到该商铺")); + return mav; + } + queryBean.setProperty(property); + List samples = czbankSampleService.findShopSample(queryBean, query.getMax()); + mav.setModel(BasicModel.buildOKModel().setResult(samples)); + return mav; + } - /**商铺相似房源接口*/ - @Authority(role = Role.USER) - public Object shopSimilarAction(@Valid ShopCollateralSampleQuery query){ - RestfulModelAndView mav = new RestfulModelAndView(); - ShopCollateralSampleQueryBean queryBean = new ShopCollateralSampleQueryBean(); - BeanUtils.copyProperties(query, queryBean); - FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(queryBean.getDistrict()); - if(fangjiaOfficialAreaMap == null){ - String msg = "地区信息无法映射到房价网的地区信息->(province:" + queryBean.getProvince() + " ,city: " + queryBean.getCity() + " ,district: " + queryBean.getDistrict() + ")"; - mav.setModel(BasicModel.buildBadRequestModel(msg)); - return mav; - } - queryBean.setFangjiaCity(fangjiaOfficialAreaMap.getFangjiaCity()); - queryBean.setFangjiaDistrict(fangjiaOfficialAreaMap.getFangjiaDistrict()); - District property = districtService.findByNameAndAlias(queryBean.getFangjiaCity(), queryBean.getFangjiaDistrict(), queryBean.getBuildingName(), "shop"); - if(property == null){ - mav.setModel(BasicModel.buildBadRequestModel("未找到该商铺")); - return mav; - } - queryBean.setProperty(property); - List samples = czbankSampleService.findShopSample(queryBean, query.getMax()); - mav.setModel(BasicModel.buildOKModel().setResult(samples)); - return mav; - } + private List convertQueryToBean(CollateralSampleQuery... queries) throws Exception { + + List queryBeans = new ArrayList(queries.length); + for (CollateralSampleQuery q : queries) { + + CollateralSampleQueryBean queryBean = new CollateralSampleQueryBean(); + BeanUtils.copyProperties(q, queryBean); + String city = queryBean.getCity(); + FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(q.getDistrict()); + if (fangjiaOfficialAreaMap == null) { + throw new Exception("地区信息无法映射到房价网的地区信息->(province:" + q.getProvince() + " ,city: " + q.getCity() + " ,district: " + q.getDistrict() + ")"); + } + queryBean.setFangjiaCity(fangjiaOfficialAreaMap.getFangjiaCity()); + queryBean.setFangjiaDistrict(fangjiaOfficialAreaMap.getFangjiaDistrict()); + + String propertyTypeCode = queryBean.getPropertyTypeCode(); + if (!PROPERTY_TYPE_CODE_LIST.contains(propertyTypeCode)) { + throw new Exception("propertyTypeCode取值非法"); + } + String cat = "district"; + District property = districtService.findByNameAndAlias(queryBean.getFangjiaCity(), queryBean.getFangjiaDistrict(), queryBean.getBuildingName(), cat); + if (property == null) { + throw new Exception("未找到该小区"); + } + queryBean.setProperty(property); + Integer decrCondCode = queryBean.getDecrCondCode(); + if (decrCondCode == null) { + decrCondCode = 2; + } + if (decrCondCode > 5 || decrCondCode < 1) { + throw new Exception("decrCondCode取值非法"); + } + Integer towardDirectCode = queryBean.getTowardDirectCode(); + if (towardDirectCode == null) { + towardDirectCode = 3; + } + if (towardDirectCode > 10 || towardDirectCode < 1) { + throw new Exception("towardDirectCode取值非法"); + } + queryBeans.add(queryBean); + } + return queryBeans; + } - private List convertQueryToBean(CollateralSampleQuery... queries) throws Exception{ + private List convertSampileQueryToBean(SampleQuery... queries) throws Exception { - List queryBeans = new ArrayList(queries.length); - for(CollateralSampleQuery q : queries){ + List queryBeans = new ArrayList(queries.length); + for (SampleQuery q : queries) { - CollateralSampleQueryBean queryBean = new CollateralSampleQueryBean(); - BeanUtils.copyProperties(q, queryBean); - String city = queryBean.getCity(); - FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(q.getDistrict()); - if(fangjiaOfficialAreaMap == null){ - throw new Exception("地区信息无法映射到房价网的地区信息->(province:" + q.getProvince() + " ,city: " + q.getCity() + " ,district: " + q.getDistrict() + ")"); - } - queryBean.setFangjiaCity(fangjiaOfficialAreaMap.getFangjiaCity()); - queryBean.setFangjiaDistrict(fangjiaOfficialAreaMap.getFangjiaDistrict()); - - String propertyTypeCode = queryBean.getPropertyTypeCode(); - if(!PROPERTY_TYPE_CODE_LIST.contains(propertyTypeCode)){ - throw new Exception("propertyTypeCode取值非法"); - } - String cat = "district"; - District property = districtService.findByNameAndAlias(queryBean.getFangjiaCity(), queryBean.getFangjiaDistrict(), queryBean.getBuildingName(), cat); - if(property == null){ - throw new Exception("未找到该小区"); - } - queryBean.setProperty(property); - Integer decrCondCode = queryBean.getDecrCondCode(); - if(decrCondCode == null){ - decrCondCode = 2; - } - if(decrCondCode > 5 || decrCondCode < 1){ - throw new Exception("decrCondCode取值非法"); - } - Integer towardDirectCode = queryBean.getTowardDirectCode(); - if(towardDirectCode == null){ - towardDirectCode = 3; - } - if(towardDirectCode > 10 || towardDirectCode < 1){ - throw new Exception("towardDirectCode取值非法"); - } - queryBeans.add(queryBean); - } - return queryBeans; - } - - - private List convertSampileQueryToBean(SampleQuery... queries) throws Exception{ - - List queryBeans = new ArrayList(queries.length); - for(SampleQuery q : queries){ - - CollateralSampleQueryBean queryBean = new CollateralSampleQueryBean(); - BeanUtils.copyProperties(q, queryBean); + CollateralSampleQueryBean queryBean = new CollateralSampleQueryBean(); + BeanUtils.copyProperties(q, queryBean); // String propertyTypeCode = queryBean.getPropertyTypeCode(); // if(!Arrays.asList("01", "02", "03").contains(propertyTypeCode)){ // throw new Exception("propertyTypeCode取值非法"); // } - String cat = "district"; + String cat = "district"; - if(StringUtils.isNotBlank(queryBean.getCity()) && StringUtils.isNotBlank(queryBean.getDistrict()) && StringUtils.isNotBlank(queryBean.getBuildingName())){ - District property = districtService.findByNameAndAlias(queryBean.getCity(), queryBean.getDistrict(), queryBean.getBuildingName(), cat); - if(property == null){ - throw new Exception("未找到该小区"); - } - queryBean.setProperty(property); - }else if(StringUtils.isNotBlank(queryBean.getAddress())){ - HttpRequest request = new HttpRequest(); - JSONObject json = null; - String address = queryBean.getAddress().replace(" ","").replace("%",""); - Map params = new HashMap(); - params.put("city", queryBean.getCity()); - params.put("address", address); - params.put("category", "property"); - //新匹配接口 - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8"); - if (json != null && json.size()>0) { - MatchedBuildingDto dto = CommonDtoUtils.transformV(MatchedBuildingDto.class, json); - District property = districtService.findByNameAndAlias(dto.getCity(), dto.getDistrict(), dto.getName(), cat); - if(property == null){ - throw new Exception("未找到该小区"); - } - queryBean.setProperty(property); - }else{ - throw new Exception("未找到该小区"); - } - } - String estateType = queryBean.getProperty().getEstateType2(); - queryBean.setPropertyTypeCode("01"); - if(StringUtils.isNotBlank(estateType)){ - if(estateType.equals("普通住宅")){ - queryBean.setPropertyTypeCode("01"); - }else if(estateType.equals("别墅")){ - queryBean.setPropertyTypeCode("02"); - }else if(estateType.equals("商住")){ - queryBean.setPropertyTypeCode("03"); - } - } + if (StringUtils.isNotBlank(queryBean.getCity()) && StringUtils.isNotBlank(queryBean.getDistrict()) && StringUtils.isNotBlank(queryBean.getBuildingName())) { + District property = districtService.findByNameAndAlias(queryBean.getCity(), queryBean.getDistrict(), queryBean.getBuildingName(), cat); + if (property == null) { + throw new Exception("未找到该小区"); + } + queryBean.setProperty(property); + } else if (StringUtils.isNotBlank(queryBean.getAddress())) { + HttpRequest request = new HttpRequest(); + JSONObject json = null; + String address = queryBean.getAddress().replace(" ", "").replace("%", ""); + Map params = new HashMap(); + params.put("city", queryBean.getCity()); + params.put("address", address); + params.put("category", "property"); + //新匹配接口 + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8"); + if (json != null && json.size() > 0) { + MatchedBuildingDto dto = CommonDtoUtils.transformV(MatchedBuildingDto.class, json); + District property = districtService.findByNameAndAlias(dto.getCity(), dto.getDistrict(), dto.getName(), cat); + if (property == null) { + throw new Exception("未找到该小区"); + } + queryBean.setProperty(property); + } else { + throw new Exception("未找到该小区"); + } + } + String estateType = queryBean.getProperty().getEstateType2(); + queryBean.setPropertyTypeCode("01"); + if (StringUtils.isNotBlank(estateType)) { + if (estateType.equals("普通住宅")) { + queryBean.setPropertyTypeCode("01"); + } else if (estateType.equals("别墅")) { + queryBean.setPropertyTypeCode("02"); + } else if (estateType.equals("商住")) { + queryBean.setPropertyTypeCode("03"); + } + } - Integer decrCondCode = queryBean.getDecrCondCode(); - if(decrCondCode == null){ - decrCondCode = 2; - } - if(decrCondCode > 5 || decrCondCode < 1){ - throw new Exception("decrCondCode取值非法"); - } - Integer towardDirectCode = queryBean.getTowardDirectCode(); - if(towardDirectCode == null){ - towardDirectCode = 3; - } - if(towardDirectCode > 10 || towardDirectCode < 1){ - throw new Exception("towardDirectCode取值非法"); - } - queryBeans.add(queryBean); - } - return queryBeans; - } + Integer decrCondCode = queryBean.getDecrCondCode(); + if (decrCondCode == null) { + decrCondCode = 2; + } + if (decrCondCode > 5 || decrCondCode < 1) { + throw new Exception("decrCondCode取值非法"); + } + Integer towardDirectCode = queryBean.getTowardDirectCode(); + if (towardDirectCode == null) { + towardDirectCode = 3; + } + if (towardDirectCode > 10 || towardDirectCode < 1) { + throw new Exception("towardDirectCode取值非法"); + } + queryBeans.add(queryBean); + } + return queryBeans; + } // private List convertSampileQueryToBean(SampleQuery... queries) throws Exception{ @@ -437,487 +438,599 @@ public class HouseController { // return queryBeans; // } - public Object detailAction(HousePublishModel model){ - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if(StringUtils.isBlank(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房源id不能为空")); - return mav; - } - if(StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); - return mav; - } - House dbHouse = houseService.findHouseById(model.getId()); - if(dbHouse == null || dbHouse.getStatus() == HOUSE_DELETE_STATUS){ - mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); - return mav; - } - Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); - String userId = tokenMap.get("userid"); - if(dbHouse.getUserId() == null || !userId.equals(dbHouse.getUserId().toString())){ - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限访问该房源")); - return mav; - } - mav.setModel(BasicModel.buildOKModel().setResult(new HouseDto(dbHouse))); - return mav; - } + public Object detailAction(HousePublishModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isBlank(model.getId())) { + mav.setModel(BasicModel.buildBadRequestModel("房源id不能为空")); + return mav; + } + if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { + mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); + return mav; + } + House dbHouse = houseService.findHouseById(model.getId()); + if (dbHouse == null || dbHouse.getStatus() == HOUSE_DELETE_STATUS) { + mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); + return mav; + } + Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); + String userId = tokenMap.get("userid"); + if (dbHouse.getUserId() == null || !userId.equals(dbHouse.getUserId().toString())) { + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限访问该房源")); + return mav; + } + mav.setModel(BasicModel.buildOKModel().setResult(new HouseDto(dbHouse))); + return mav; + } - public Object deleteAction(HousePublishModel model){ - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if(StringUtils.isBlank(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房源id不能为空")); - return mav; - } - if(StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); - return mav; - } - House dbHouse = houseService.findHouseById(model.getId()); - if(dbHouse == null || dbHouse.getStatus() == HOUSE_DELETE_STATUS){ - mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); - return mav; - } - Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); - String userId = tokenMap.get("userid"); - if(dbHouse.getUserId() == null || !userId.equals(dbHouse.getUserId().toString())){ - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限删除该房源")); - return mav; - } - houseService.deleteHouse(dbHouse.getId()); - mav.setModel(BasicModel.buildOKModel().setMsg("删除成功")); - return mav; - } + public Object deleteAction(HousePublishModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isBlank(model.getId())) { + mav.setModel(BasicModel.buildBadRequestModel("房源id不能为空")); + return mav; + } + if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { + mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); + return mav; + } + House dbHouse = houseService.findHouseById(model.getId()); + if (dbHouse == null || dbHouse.getStatus() == HOUSE_DELETE_STATUS) { + mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); + return mav; + } + Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); + String userId = tokenMap.get("userid"); + if (dbHouse.getUserId() == null || !userId.equals(dbHouse.getUserId().toString())) { + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限删除该房源")); + return mav; + } + houseService.deleteHouse(dbHouse.getId()); + mav.setModel(BasicModel.buildOKModel().setMsg("删除成功")); + return mav; + } - public Object refreshAction(HousePublishModel model){ - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if(StringUtils.isBlank(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房源id不能为空")); - return mav; - } - if(StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())){ - mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); - return mav; - } - House dbHouse = houseService.findHouseById(model.getId()); - if(dbHouse == null || dbHouse.getStatus() == HOUSE_DELETE_STATUS){ - mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); - return mav; - } - Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); - String userId = tokenMap.get("userid"); - if(dbHouse.getUserId() == null || !userId.equals(dbHouse.getUserId().toString())){ - mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限删除该房源")); - return mav; - } - boolean refresh = houseService.refreshHouse(dbHouse.getId(), Integer.valueOf(userId), "api"); - if(!refresh){ - mav.setModel(BasicModel.buildOKModel().setMsg("每天只能刷新一次房源")); - return mav; - }else{ - mav.setModel(BasicModel.buildOKModel().setMsg("刷新成功")); - return mav; - } - } + public Object refreshAction(HousePublishModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isBlank(model.getId())) { + mav.setModel(BasicModel.buildBadRequestModel("房源id不能为空")); + return mav; + } + if (StringUtils.isBlank(model.getId()) || !ObjectId.isValid(model.getId())) { + mav.setModel(BasicModel.buildBadRequestModel("房源id不合法")); + return mav; + } + House dbHouse = houseService.findHouseById(model.getId()); + if (dbHouse == null || dbHouse.getStatus() == HOUSE_DELETE_STATUS) { + mav.setModel(BasicModel.buildBadRequestModel("房源不存在")); + return mav; + } + Map tokenMap = FangjiaApiUtil.parseToken(model.getToken()); + String userId = tokenMap.get("userid"); + if (dbHouse.getUserId() == null || !userId.equals(dbHouse.getUserId().toString())) { + mav.setModel(BasicModel.buildUnAuthorizedModel().setMsg("你没有权限删除该房源")); + return mav; + } + boolean refresh = houseService.refreshHouse(dbHouse.getId(), Integer.valueOf(userId), "api"); + if (!refresh) { + mav.setModel(BasicModel.buildOKModel().setMsg("每天只能刷新一次房源")); + return mav; + } else { + mav.setModel(BasicModel.buildOKModel().setMsg("刷新成功")); + return mav; + } + } - public Object listAction(final HouseSearchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isBlank(model.getId()) && (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getName()))) { - mav.setModel(BasicModel.buildBadRequestModel("楼盘编号或城市,区域,名称为必填项")); - return mav; - } - District district = null; - DistrictKey districtKey = null; - if(StringUtils.isNotBlank(model.getName())){ - districtKey = new DistrictKey(model.getCity(), model.getRegion(), model.getName()); - district = districtService.findDistrict(districtKey, "district"); - }else{ - district = districtService.findDistrictById(model.getId()); - if(district!=null){ - districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName()); - } - } + public Object listAction(final HouseSearchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isBlank(model.getId()) && (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getName()))) { + mav.setModel(BasicModel.buildBadRequestModel("楼盘编号或城市,区域,名称为必填项")); + return mav; + } + District district = null; + DistrictKey districtKey = null; + if (StringUtils.isNotBlank(model.getName())) { + districtKey = new DistrictKey(model.getCity(), model.getRegion(), model.getName()); + district = districtService.findDistrict(districtKey, "district"); + } else { + district = districtService.findDistrictById(model.getId()); + if (district != null) { + districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName()); + } + } - if(district == null){ - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); - return mav; - } - DistrictStatBo bo = districtStatService.findCurrentDistrictStat(districtKey); - Integer minPrice = null; - Integer maxPrice = null; - if(bo.getDistrictStat()!=null){ - minPrice = (int)(bo.getDistrictStat().getAvgPrice() * 0.8); - maxPrice = (int)(bo.getDistrictStat().getAvgPrice() * 1.2); - } - List names = new ArrayList(); - names.add(district.getName()); - if(district.getAlias() != null){ - for(String alia : district.getAlias()){ - if(StringUtils.isNotBlank(alia) && !names.contains(alia)){ - names.add(alia); - } - } - } - List houses = seawaterDao.findSeawatersFromEs("sell", district.getCity(), district.getRegion(), district.getName(), district.getAlias(), null, model.getStartTime(), model.getEndTime(),null,null,minPrice, maxPrice,null,null,"p_date", false,0, model.getPageSize(),"latest_seawater"); - //List houses1 = seawaterDao.findHouses(district.getCity(), district.getRegion(), names, minPrice, maxPrice, model.getPageSize()); - mav.setModel(BasicModel.buildOKModel().setResult(houses)); - return mav; - } + if (district == null) { + mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + return mav; + } + DistrictStatBo bo = districtStatService.findCurrentDistrictStat(districtKey); + Integer minPrice = null; + Integer maxPrice = null; + if (bo.getDistrictStat() != null) { + minPrice = (int) (bo.getDistrictStat().getAvgPrice() * 0.8); + maxPrice = (int) (bo.getDistrictStat().getAvgPrice() * 1.2); + } + List names = new ArrayList(); + names.add(district.getName()); + if (district.getAlias() != null) { + for (String alia : district.getAlias()) { + if (StringUtils.isNotBlank(alia) && !names.contains(alia)) { + names.add(alia); + } + } + } + List houses = seawaterDao.findSeawatersFromEs("sell", district.getCity(), district.getRegion(), district.getName(), district.getAlias(), null, model.getStartTime(), model.getEndTime(), null, null, minPrice, maxPrice, null, null, "p_date", false, 0, model.getPageSize(), "latest_seawater"); + //List houses1 = seawaterDao.findHouses(district.getCity(), district.getRegion(), names, minPrice, maxPrice, model.getPageSize()); + mav.setModel(BasicModel.buildOKModel().setResult(houses)); + return mav; + } + public Object arroundlistAction(final HouseSearchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isBlank(model.getId()) && (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getName()))) { + mav.setModel(BasicModel.buildBadRequestModel("楼盘编号或城市,区域,名称为必填项")); + return mav; + } + District district = null; + DistrictKey districtKey = null; + if (StringUtils.isNotBlank(model.getName())) { + districtKey = new DistrictKey(model.getCity(), model.getRegion(), model.getName()); + district = districtService.findDistrict(districtKey, "district"); + } else { + district = districtService.findDistrictById(model.getId()); + if (district != null) { + districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName()); + } + } - public Object arroundlistAction(final HouseSearchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isBlank(model.getId()) && (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getRegion()) || StringUtils.isBlank(model.getName()))) { - mav.setModel(BasicModel.buildBadRequestModel("楼盘编号或城市,区域,名称为必填项")); - return mav; - } - District district = null; - DistrictKey districtKey = null; - if(StringUtils.isNotBlank(model.getName())){ - districtKey = new DistrictKey(model.getCity(), model.getRegion(), model.getName()); - district = districtService.findDistrict(districtKey, "district"); - }else{ - district = districtService.findDistrictById(model.getId()); - if(district!=null){ - districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName()); - } - } + if (district == null) { + mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + return mav; + } - if(district == null){ - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); - return mav; - } + //周边小区,默认10 + List districts = districtService.findNearestDistrict(district, 1000, model.getDistCount()); + List houses = new ArrayList(); + for (District dist : districts) { + districtKey = new DistrictKey(dist.getCity(), dist.getRegion(), dist.getName()); + DistrictStatBo bo = districtStatService.findCurrentDistrictStat(districtKey); + Integer minPrice = null; + Integer maxPrice = null; + if (bo.getDistrictStat() != null) { + minPrice = (int) (bo.getDistrictStat().getAvgPrice() * 0.9); + maxPrice = (int) (bo.getDistrictStat().getAvgPrice() * 1.1); + } + List names = new ArrayList(); + names.add(district.getName()); + if (district.getAlias() != null) { + for (String alia : district.getAlias()) { + if (StringUtils.isNotBlank(alia) && !names.contains(alia)) { + names.add(alia); + } + } + } + List arroundhouses = seawaterDao.findSeawatersFromEs("sell", dist.getCity(), dist.getRegion(), dist.getName(), dist.getAlias(), null, model.getStartTime(), model.getEndTime(), null, null, minPrice, maxPrice, null, null, "p_date", false, 0, model.getPageSize(), "latest_seawater"); + if (arroundhouses != null && arroundhouses.size() > 0) { + houses.addAll(arroundhouses); + } + } + mav.setModel(BasicModel.buildOKModel().setResult(houses)); + return mav; + } - //周边小区,默认10 - List districts = districtService.findNearestDistrict(district, 1000, model.getDistCount()); - List houses = new ArrayList(); - for(District dist : districts){ - districtKey = new DistrictKey(dist.getCity(), dist.getRegion(), dist.getName()); - DistrictStatBo bo = districtStatService.findCurrentDistrictStat(districtKey); - Integer minPrice = null; - Integer maxPrice = null; - if(bo.getDistrictStat()!=null){ - minPrice = (int)(bo.getDistrictStat().getAvgPrice() * 0.9); - maxPrice = (int)(bo.getDistrictStat().getAvgPrice() * 1.1); - } - List names = new ArrayList(); - names.add(district.getName()); - if(district.getAlias() != null){ - for(String alia : district.getAlias()){ - if(StringUtils.isNotBlank(alia) && !names.contains(alia)){ - names.add(alia); - } - } - } - List arroundhouses = seawaterDao.findSeawatersFromEs("sell", dist.getCity(), dist.getRegion(), dist.getName(), dist.getAlias(), null, model.getStartTime(), model.getEndTime(),null,null,minPrice, maxPrice,null,null,"p_date", false,0, model.getPageSize(),"latest_seawater"); - if(arroundhouses!=null && arroundhouses.size()>0){ - houses.addAll(arroundhouses); - } - } - mav.setModel(BasicModel.buildOKModel().setResult(houses)); - return mav; - } + String getPicUrl(String url, List urls) { + if (!urls.contains(url)) { + urls.add(url); + return url; + } + for (int i = 0; ; i++) { + String newName = url + "_" + i; + if (!urls.contains(newName)) { + return url; + } + } + } - String getPicUrl(String url, List urls) { - if (!urls.contains(url)) { - urls.add(url); - return url; - } - for (int i = 0;; i++) { - String newName = url + "_" + i; - if (!urls.contains(newName)) { - return url; - } - } - } + private House createHouse(HousePublishModel model, Integer userId) { + House house = new House(); + house.setSource("api"); + house.setUserId(userId); + house.setCat("sell"); + house.setId(model.getId()); + house.setDistrictName(model.getPropertyName()); + house.setCity(model.getCity()); + house.setRegion(model.getDistrict()); + house.setBlock(model.getBlock()); + house.setAddress(model.getAddress()); + house.setName(model.getTitle()); + house.setDescription(model.getDescription()); + house.setBuildDate(model.getBuildDate() == null ? null : (model.getBuildDate().toString() + "年")); + house.setContactPeople(model.getContactPerson()); + house.setMobile(model.getMobile()); + house.setFloor(model.getFloor()); + house.setHeight(model.getMaxFloor()); + house.setFitment(model.getFitment()); + house.setDirection(model.getDirection()); + house.setTotalPrice((int) (model.getTotalPrice() * 10000)); + house.setArea(model.getSize()); + house.setRoom(model.getRoom()); + house.setHall(model.getHall()); + house.setToilet(model.getToilet()); + house.setHouseNum(model.getBuildingNum()); + house.setRoomNum(model.getRoomNum()); + house.setUrl("fangjia.com"); + house.setStatus(0); + house.setPublishDate(new Date()); + house.setModificationDate(new Date()); + house.setRemark(model.getRemark()); + return house; + } - private House createHouse(HousePublishModel model, Integer userId){ - House house = new House(); - house.setSource("api"); - house.setUserId(userId); - house.setCat("sell"); - house.setId(model.getId()); - house.setDistrictName(model.getPropertyName()); - house.setCity(model.getCity()); - house.setRegion(model.getDistrict()); - house.setBlock(model.getBlock()); - house.setAddress(model.getAddress()); - house.setName(model.getTitle()); - house.setDescription(model.getDescription()); - house.setBuildDate(model.getBuildDate() == null ? null : (model.getBuildDate().toString() + "年")); - house.setContactPeople(model.getContactPerson()); - house.setMobile(model.getMobile()); - house.setFloor(model.getFloor()); - house.setHeight(model.getMaxFloor()); - house.setFitment(model.getFitment()); - house.setDirection(model.getDirection()); - house.setTotalPrice((int)(model.getTotalPrice() * 10000)); - house.setArea(model.getSize()); - house.setRoom(model.getRoom()); - house.setHall(model.getHall()); - house.setToilet(model.getToilet()); - house.setHouseNum(model.getBuildingNum()); - house.setRoomNum(model.getRoomNum()); - house.setUrl("fangjia.com"); - house.setStatus(0); - house.setPublishDate(new Date()); - house.setModificationDate(new Date()); - house.setRemark(model.getRemark()); - return house; - } + @Authority(role = Role.USER) + public Object rankAction(final HouseSearchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); - @Authority(role = Role.USER) - public Object rankAction(final HouseSearchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - - Map resMap = new LinkedHashMap(); - if(StringUtils.isBlank(model.getCity()) || model.getTotalPrice() == null) { - mav.setModel(BasicModel.buildBadRequestModel("必填参数错误")); - return mav; - }else { - double[] compArrs = compareTotalPrice(model.getCity(), model.getTotalPrice()); - if (compArrs == null) { - resMap.put("rank", 0); - } else { - resMap.put("rank", compArrs[0]); - } - resMap.put("totalPrice", model.getTotalPrice()); - resMap.put("city", model.getCity()); - } - mav.setModel(resMap); - return mav; - } + Map resMap = new LinkedHashMap(); + if (StringUtils.isBlank(model.getCity()) || model.getTotalPrice() == null) { + mav.setModel(BasicModel.buildBadRequestModel("必填参数错误")); + return mav; + } else { + double[] compArrs = compareTotalPrice(model.getCity(), model.getTotalPrice()); + if (compArrs == null) { + resMap.put("rank", 0); + } else { + resMap.put("rank", compArrs[0]); + } + resMap.put("totalPrice", model.getTotalPrice()); + resMap.put("city", model.getCity()); + } + mav.setModel(resMap); + return mav; + } - public static final int VALUE_SKIP = 100; - private double[] compareTotalPrice(String city, int totalPrice) { - if(StringUtils.isBlank(city) || totalPrice <= 1000) { - return null; - } + public static final int VALUE_SKIP = 100; - final FacetQuery facetQuery = new FacetQuery(); - facetQuery.setFields(Arrays.asList("totalPriceRange")); - facetQuery.setLimit(20); - facetQuery.setMinCount(1); - final List params = new ArrayList(); - params.add(new QueryParam("cat", "sell")); - params.add(new QueryParam("visible", 0)); - params.add(new QueryParam("city", city)); - List facetQueryResult = CacheUtils.getValue(this.getClass(), "totalPriceRange", city, CacheUtils.CachePolicyEnum.MIDDLE, new Closure, String>() { - @Override - public List execute(String input) { - return houseService.facetSearch(params, facetQuery); - } - }); + private double[] compareTotalPrice(String city, int totalPrice) { + if (StringUtils.isBlank(city) || totalPrice <= 1000) { + return null; + } - int totalCount = 0; - Map rangeMap = new HashMap(); - for(FacetResult ft : facetQueryResult) { - if("total_price_range".equals(ft.getName()) && ft.getValues() != null) { - for(FacetResult.Count c : ft.getValues()) { - rangeMap.put(c.getName(), (int)c.getCount()); - totalCount += c.getCount(); - } - } - } + final FacetQuery facetQuery = new FacetQuery(); + facetQuery.setFields(Arrays.asList("totalPriceRange")); + facetQuery.setLimit(20); + facetQuery.setMinCount(1); + final List params = new ArrayList(); + params.add(new QueryParam("cat", "sell")); + params.add(new QueryParam("visible", 0)); + params.add(new QueryParam("city", city)); + List facetQueryResult = CacheUtils.getValue(this.getClass(), "totalPriceRange", city, CacheUtils.CachePolicyEnum.MIDDLE, new Closure, String>() { + @Override + public List execute(String input) { + return houseService.facetSearch(params, facetQuery); + } + }); - int baseLessThan = 0; - int baseGreaterThan = 0; - Value inthisValue = null; + int totalCount = 0; + Map rangeMap = new HashMap(); + for (FacetResult ft : facetQueryResult) { + if ("total_price_range".equals(ft.getName()) && ft.getValues() != null) { + for (FacetResult.Count c : ft.getValues()) { + rangeMap.put(c.getName(), (int) c.getCount()); + totalCount += c.getCount(); + } + } + } - //房源的最大最小值 - Integer[] extrmeValue = houseService.findExtremeTotalPrice(city, null); - if(extrmeValue == null) { - return null; - } + int baseLessThan = 0; + int baseGreaterThan = 0; + Value inthisValue = null; - List items = menuService.getItems(ServerAreaData.getServerAreaByDisplay(city), MenuCategoryEnum.ershoufang, "totalPriceRange"); - for(Item item : items) { - String[] vals = item.getValue().split("_"); - if (vals == null || vals.length == 0) { - continue; - } + //房源的最大最小值 + Integer[] extrmeValue = houseService.findExtremeTotalPrice(city, null); + if (extrmeValue == null) { + return null; + } - try { - Value itemValue = null; - if (vals.length == 1) { - itemValue = new Value(Integer.parseInt(vals[0]), extrmeValue[1], item.getValue()); - } else if (vals.length == 2) { - if (vals[1] == null || "".equals(vals[1])) { - itemValue = new Value(Integer.parseInt(vals[0]), extrmeValue[1], item.getValue()); - } else { - itemValue = new Value(Integer.parseInt(vals[0]), Integer.parseInt(vals[1]), item.getValue()); - } - } - if(itemValue.getMin() == 0 && extrmeValue[0] < itemValue.getMax()) { - itemValue.setMin(extrmeValue[0]); - } + List items = menuService.getItems(ServerAreaData.getServerAreaByDisplay(city), MenuCategoryEnum.ershoufang, "totalPriceRange"); + for (Item item : items) { + String[] vals = item.getValue().split("_"); + if (vals == null || vals.length == 0) { + continue; + } - if (totalPrice >= itemValue.getMin() && totalPrice < itemValue.getMax()) { - inthisValue = itemValue; - inthisValue.setName(item.getName()); - } + try { + Value itemValue = null; + if (vals.length == 1) { + itemValue = new Value(Integer.parseInt(vals[0]), extrmeValue[1], item.getValue()); + } else if (vals.length == 2) { + if (vals[1] == null || "".equals(vals[1])) { + itemValue = new Value(Integer.parseInt(vals[0]), extrmeValue[1], item.getValue()); + } else { + itemValue = new Value(Integer.parseInt(vals[0]), Integer.parseInt(vals[1]), item.getValue()); + } + } + if (itemValue.getMin() == 0 && extrmeValue[0] < itemValue.getMax()) { + itemValue.setMin(extrmeValue[0]); + } - if(itemValue.getMax() < totalPrice) { - baseLessThan += (rangeMap.containsKey(item.getName()) ? rangeMap.get(item.getName()) : 0); - } + if (totalPrice >= itemValue.getMin() && totalPrice < itemValue.getMax()) { + inthisValue = itemValue; + inthisValue.setName(item.getName()); + } - if(itemValue.getMin() > totalPrice) { - baseGreaterThan += (rangeMap.containsKey(item.getName()) ? rangeMap.get(item.getName()) : 0); - } - } catch (Exception e) { - return null; - } - } + if (itemValue.getMax() < totalPrice) { + baseLessThan += (rangeMap.containsKey(item.getName()) ? rangeMap.get(item.getName()) : 0); + } - if(inthisValue != null) { - double p = ((totalPrice - inthisValue.getMin()) / (double)VALUE_SKIP) / ((inthisValue.getMax() - inthisValue.getMin()) / (double)VALUE_SKIP); - if(rangeMap.containsKey(inthisValue.getName())) { - baseLessThan += p * rangeMap.get(inthisValue.getName()); - baseGreaterThan += ((1.0 - p) * rangeMap.get(inthisValue.getName())); - } - } + if (itemValue.getMin() > totalPrice) { + baseGreaterThan += (rangeMap.containsKey(item.getName()) ? rangeMap.get(item.getName()) : 0); + } + } catch (Exception e) { + return null; + } + } - return new double[]{(int)((double)baseLessThan / (double)totalCount * 10000) / 100.0, (int)((double)baseGreaterThan / (double)totalCount * 10000) / 100.0}; - } + if (inthisValue != null) { + double p = ((totalPrice - inthisValue.getMin()) / (double) VALUE_SKIP) / ((inthisValue.getMax() - inthisValue.getMin()) / (double) VALUE_SKIP); + if (rangeMap.containsKey(inthisValue.getName())) { + baseLessThan += p * rangeMap.get(inthisValue.getName()); + baseGreaterThan += ((1.0 - p) * rangeMap.get(inthisValue.getName())); + } + } - @Authority(role = Role.USER) - public Object searchAction(final HouseSearchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isBlank(model.getResidenceId())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区ID(residenceId)不能为空")); - return mav; - } - if (StringUtils.isNotBlank(model.getFloor()) && !StringUtil.isInteger(model.getFloor())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "楼层(floor)必须是数字")); - return mav; - } - if (StringUtils.isNotBlank(model.getHouseNo()) && !StringUtil.isInteger(model.getUnitNo())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "楼号((unitNo)必须是数字")); - return mav; - } - if (model.getSize() == null) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "请输入房屋面积(size)")); - return mav; - } - if (StringUtils.isBlank(model.getEstateType())) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "请输入物业类型编码(estateType)")); - return mav; - } else { - String estateType = getEstateType(model.getEstateType()); - if (estateType == null) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "请输入正确的物业类型编码")); - return mav; - } - model.setEstateType(estateType); - } - if (StringUtils.isNotBlank(model.getBuildingType())) { - String buildingType = getBulidType(model.getBuildingType()); - if (buildingType == null) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "请输入正确的建筑类型编码")); - return mav; - } else { - model.setBuildingType(buildingType); - } - } - District district = districtService.findById(model.getResidenceId(), INCLUDE_DISTRICT_FIELDS); - if (district == null) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "没有找到相关的楼盘:小区已删除")); - return mav; - } + return new double[]{(int) ((double) baseLessThan / (double) totalCount * 10000) / 100.0, (int) ((double) baseGreaterThan / (double) totalCount * 10000) / 100.0}; + } - Date endDate = getLatestStatIndex(district.getCity()); - if (endDate == null) { - mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "没有找到相关的楼盘:不存在小区所在城市的指数数据")); - return mav; - } + @Authority(role = Role.USER) + public Object searchAction(final HouseSearchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isBlank(model.getResidenceId())) { + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "小区ID(residenceId)不能为空")); + return mav; + } + if (StringUtils.isNotBlank(model.getFloor()) && !StringUtil.isInteger(model.getFloor())) { + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "楼层(floor)必须是数字")); + return mav; + } + if (StringUtils.isNotBlank(model.getHouseNo()) && !StringUtil.isInteger(model.getUnitNo())) { + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "楼号((unitNo)必须是数字")); + return mav; + } + if (model.getSize() == null) { + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "请输入房屋面积(size)")); + return mav; + } + if (StringUtils.isBlank(model.getEstateType())) { + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "请输入物业类型编码(estateType)")); + return mav; + } else { + String estateType = getEstateType(model.getEstateType()); + if (estateType == null) { + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "请输入正确的物业类型编码")); + return mav; + } + model.setEstateType(estateType); + } + if (StringUtils.isNotBlank(model.getBuildingType())) { + String buildingType = getBulidType(model.getBuildingType()); + if (buildingType == null) { + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "请输入正确的建筑类型编码")); + return mav; + } else { + model.setBuildingType(buildingType); + } + } + District district = districtService.findById(model.getResidenceId(), INCLUDE_DISTRICT_FIELDS); + if (district == null) { + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "没有找到相关的楼盘:小区已删除")); + return mav; + } - // 组装数据 - Map resMap = new LinkedHashMap(); - FacetQueryResult houseBoList = new FacetQueryResult(); - resMap.put("city", DistrictCodeUtils.getCityCode(district.getCity())); - resMap.put("region", district.getRegion()); - resMap.put("name", district.getName()); + Date endDate = getLatestStatIndex(district.getCity()); + if (endDate == null) { + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "没有找到相关的楼盘:不存在小区所在城市的指数数据")); + return mav; + } - // 查房源 - FacetQueryResult houseList = findDistrictHouses(district, null); - boolean showDetail = false; - if (model.getShowDetail() != null && model.getShowDetail().booleanValue() == true) { - showDetail = true; - } + // 组装数据 + Map resMap = new LinkedHashMap(); + FacetQueryResult houseBoList = new FacetQueryResult(); + resMap.put("city", DistrictCodeUtils.getCityCode(district.getCity())); + resMap.put("region", district.getRegion()); + resMap.put("name", district.getName()); - houseBoList.addAll(fillDistrictInfoForHouse(houseList, endDate, district, showDetail, true)); - if (houseBoList.size() < 5) { - if (HouseValidator.validateEstateType(model.getEstateType())) { - district.setEstateType2(model.getEstateType()); - } - List districts = districtService.findSimilarityDistrict(district, 1000, 3);// 查找一公里以内相似的小区 - for (District d : districts) { - d = districtService.findById(d.getId() , INCLUDE_DISTRICT_FIELDS); - if (getRemainUseYear(district) == null) { - continue; - } - district = d; - houseList = findDistrictHouses(district, null); - houseBoList.addAll(fillDistrictInfoForHouse(houseList, endDate, district, showDetail, false)); - if (houseBoList.size() > 5) { - break; - } - } - } - if (houseList.getNumberFound() > 0) { - orderHouseList(houseBoList, model); - } + // 查房源 + FacetQueryResult houseList = findDistrictHouses(district, null); + boolean showDetail = false; + if (model.getShowDetail() != null && model.getShowDetail().booleanValue() == true) { + showDetail = true; + } - if (houseBoList.size() > 5) { - houseBoList = new FacetQueryResult(houseBoList.subList(0, 5)); - } - if(houseBoList.isEmpty()){ - BasicModel.markNoDataRequest(); - } - resMap.put("totalCount", houseBoList.size()); - resMap.put("houses", houseBoList); - mav.setModel(resMap); - mav.setViewType("rest"); - return mav; - } + houseBoList.addAll(fillDistrictInfoForHouse(houseList, endDate, district, showDetail, true)); + if (houseBoList.size() < 5) { + if (HouseValidator.validateEstateType(model.getEstateType())) { + district.setEstateType2(model.getEstateType()); + } + List districts = districtService.findSimilarityDistrict(district, 1000, 3);// 查找一公里以内相似的小区 + for (District d : districts) { + d = districtService.findById(d.getId(), INCLUDE_DISTRICT_FIELDS); + if (getRemainUseYear(district) == null) { + continue; + } + district = d; + houseList = findDistrictHouses(district, null); + houseBoList.addAll(fillDistrictInfoForHouse(houseList, endDate, district, showDetail, false)); + if (houseBoList.size() > 5) { + break; + } + } + } + if (houseList.getNumberFound() > 0) { + orderHouseList(houseBoList, model); + } + + if (houseBoList.size() > 5) { + houseBoList = new FacetQueryResult(houseBoList.subList(0, 5)); + } + if (houseBoList.isEmpty()) { + BasicModel.markNoDataRequest(); + } + resMap.put("totalCount", houseBoList.size()); + resMap.put("houses", houseBoList); + mav.setModel(resMap); + mav.setViewType("rest"); + return mav; + } + + @Authority(role = Role.USER) + public Object aroundAction(final HouseSearchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isBlank(model.getLocation())) { + mav.setModel(BasicModel.buildBadRequestModel("location(经纬度)不能为空")); + return mav; + } + model.setLocation(model.getLocation().replace(",", ",")); + if (StringUtils.isBlank(model.getLocation()) || !model.getLocation().contains(",")) { + mav.setModel(BasicModel.buildBadRequestModel("location(经纬度)不能为空或格式错误")); + return mav; + } + String[] locationStr = model.getLocation().split(","); + Double lng = Double.valueOf(locationStr[0]); + Double lat = Double.valueOf(locationStr[1]); + if ("2".equals(model.getLocationType())) { + Map gcj02Location = GeoUtils.bd09ToGcj02(lat, lng); + lng = gcj02Location.get("lng"); + lat = gcj02Location.get("lat"); + } + if (lng < 70 || lng > 140 || lat < 0 || lat > 55) { + mav.setModel(BasicModel.buildBadRequestModel("非中国经纬度")); + return mav; + } + String category = "district"; + if ("1".equals(model.getPropertyType())) { + category = "office"; + } else if ("2".equals(model.getPropertyType())) { + category = "shop"; + } + + List seaweedList = seaweedService.findSeaweedByLocation(lat, lng, 3000, category); + if (seaweedList == null || seaweedList.isEmpty()) { + mav.setModel(BasicModel.buildBadRequestModel("没有找到相关的楼盘")); + return mav; + } + String cat = "sell"; + if ("1".equals(model.getHouseType())) { + if ("0".equals(model.getPropertyType())) { + cat = "rent"; + } + if ("1".equals(model.getPropertyType())) { + cat = "office_rent"; + } + if ("2".equals(model.getPropertyType())) { + cat = "shop_rent"; + } + } else { + if ("1".equals(model.getPropertyType())) { + cat = "office_sell"; + } + if ("2".equals(model.getPropertyType())) { + cat = "shop_sell"; + } + } + List houses; + List houseList = new ArrayList(); + for (Seaweed seaweed : seaweedList) { + + if (model.getSize() != null && model.getSize() != 0) { + Double size = model.getSize(); + houses = seawaterDao.findSeawatersFromEs(cat, seaweed.getCity(), seaweed.getRegion(), seaweed.getName(), seaweed.getAlias(), null, + model.getStartTime(), model.getEndTime(), 0.9 * size, 1.1 * size, null, null, null, null, + "p_date", false, 0, 5, "latest_seawater"); + } else { + houses = seawaterDao.findSeawatersFromEs(cat, seaweed.getCity(), seaweed.getRegion(), seaweed.getName(), seaweed.getAlias(), null, + model.getStartTime(), model.getEndTime(), null, null, null, null, null, null, + "p_date", false, 0, 5, "latest_seawater"); + } + for (Seawater house : houses) { + Seawater seawater = new Seawater(); + seawater.setCity(house.getCity()); + seawater.setDistrict(house.getRegion()); + seawater.setAddress(house.getAddress()); + seawater.setName(house.getDistrictName()); + seawater.setSize(house.getArea()); + seawater.setUnitPrice(house.getAvgPrice()); + seawater.setTotalPrice(house.getTotalPrice()); + seawater.setDirection(house.getDirection()); + seawater.setFloor(house.getFloor()); + seawater.setMaxFloor(house.getHeight()); + seawater.setRoom(house.getRoom()); + seawater.setHall(house.getHall()); + seawater.setToilet(house.getToilet()); + seawater.setDecoration(house.getFitment()); + if (house.getpDate() != null && house.getpDate() > 10000000) { + String numberStr = String.valueOf(house.getpDate()); + // 拆分字符串并格式化 + String year = numberStr.substring(0, 4); // 前四位是年份 + String month = numberStr.substring(4, 6); // 中间两位是月份 + String day = numberStr.substring(6, 8); // 最后两位是日期 + String formattedDate = year + "-" + month + "-" + day; + seawater.setPublishDate(formattedDate); + } + if (houseList.size() > 4) { + break; + } + houseList.add(seawater); + } + if (houseList.size() > 4) { + break; + } + } + BasicModel basicModel = new BasicModel(200, "ok"); + // 组装数据 + basicModel.setResult(houseList); + mav.setModel(basicModel); + mav.setViewType("rest"); + return mav; + } - public Object caseAction(@Valid SampleQuery sampleQuery){ + public Object caseAction(@Valid SampleQuery sampleQuery) { - RestfulModelAndView mav = new RestfulModelAndView(); - List querys = null; - try{ - querys = convertSampileQueryToBean(sampleQuery); - }catch (Exception e){ - mav.setModel(BasicModel.buildBadRequestModel(e.getMessage())); - return mav; - } - if(null == sampleQuery.getMax()){ - sampleQuery.setMax(10); - } - long start = System.currentTimeMillis(); - List collaterals = czbankSampleService.findSample2(querys, sampleQuery.getMax()); - long end = System.currentTimeMillis(); - System.out.println("用时:"+(end-start)); - Collateral collateral = collaterals.get(0); - List samples = collateral.getSample(); - UniversalDto dto = UniversalDto.newDto(); - if(null != collateral.getMaxPrice()){ - dto.append("maxUnitPrice", collateral.getMaxPrice()); - } - if(null != collateral.getMinPrice()){ - dto.append("minUnitPrice", collateral.getMinPrice()); - } + RestfulModelAndView mav = new RestfulModelAndView(); + List querys = null; + try { + querys = convertSampileQueryToBean(sampleQuery); + } catch (Exception e) { + mav.setModel(BasicModel.buildBadRequestModel(e.getMessage())); + return mav; + } + if (null == sampleQuery.getMax()) { + sampleQuery.setMax(10); + } + long start = System.currentTimeMillis(); + List collaterals = czbankSampleService.findSample2(querys, sampleQuery.getMax()); + long end = System.currentTimeMillis(); + System.out.println("用时:" + (end - start)); + Collateral collateral = collaterals.get(0); + List samples = collateral.getSample(); + UniversalDto dto = UniversalDto.newDto(); + if (null != collateral.getMaxPrice()) { + dto.append("maxUnitPrice", collateral.getMaxPrice()); + } + if (null != collateral.getMinPrice()) { + dto.append("minUnitPrice", collateral.getMinPrice()); + } - dto.append("datas", samples); + dto.append("datas", samples); // if(samples!= null && samples.size()>=2){ // Sample minSample = samples.get(samples.size()-2); // Sample maxSample = samples.get(samples.size()-1); @@ -930,160 +1043,158 @@ public class HouseController { // dto.append("datas", samples); // } - mav.setModel(BasicModel.buildOKModel().setResult(dto)); - return mav; - } + mav.setModel(BasicModel.buildOKModel().setResult(dto)); + return mav; + } + private List fillDistrictInfoForHouse(FacetQueryResult houseList, Date endDate, + District district, boolean showDetail, boolean matchModel) { + FacetQueryResult list = new FacetQueryResult(); + String estateType; + if (district.getEstateType2() != null && ESTATE_TYPE_CODE.containsKey(district.getEstateType2())) { + estateType = ESTATE_TYPE_CODE.get(district.getEstateType2()); + } else { + estateType = "4"; + } + String buildingStructure = district.getBuildStructure(); + DistrictFacilitys districtFacilitys = districtFacilitysService.findDistrictFacilitys(new DistrictKey(district.getCity(), + district.getRegion(), district.getName())); + int schoolAmount; + if (districtFacilitys != null && districtFacilitys.getSchool() != null) { + schoolAmount = districtFacilitys.getSchool().size(); + if (schoolAmount > 20) { + schoolAmount = 20; + } + } else { + schoolAmount = 0; + } + int busStationAmount; + if (districtFacilitys != null && districtFacilitys.getBus() != null) { + busStationAmount = districtFacilitys.getBus().size(); + } else { + busStationAmount = 0; + } + int communityPrice = districtStatService.findLatestDistrictAvgPrice(district.getCity(), district.getRegion(), + district.getBlock(), district.getName()); + int metroStationAmount = 0; + if (district.getLng2() != null && district.getLat2() != null) { + List metroList = metroService + .findNearbyMetro(district.getCity(), district.getLng2(), district.getLat2(), 1000); + if (metroList != null) { + metroStationAmount = metroList.size(); + } + } + String buildDate = null, remainUseYear = null; + if (district.getBuildDate() != null || district.getFinishBuildingDate() != null || district.getLiveDate() != null || district.getOpenDate() != null) { + Integer minYear = getBuildYear(district.getFinishBuildingDate(), district.getLiveDate(), district.getBuildDate(), district.getOpenDate()); + if (minYear != null && minYear > 0) { + buildDate = minYear + "年"; + if (getHouseUseYear(minYear, district.getPropertyLife()) != null) { + remainUseYear = getHouseUseYear(minYear, district.getPropertyLife()) + "年";// 剩余使用年限 + } + } + } - private List fillDistrictInfoForHouse(FacetQueryResult houseList, Date endDate, - District district, boolean showDetail, boolean matchModel) { - FacetQueryResult list = new FacetQueryResult(); - String estateType; - if (district.getEstateType2() != null && ESTATE_TYPE_CODE.containsKey(district.getEstateType2())) { - estateType = ESTATE_TYPE_CODE.get(district.getEstateType2()); - } else { - estateType = "4"; - } - String buildingStructure = district.getBuildStructure(); - DistrictFacilitys districtFacilitys = districtFacilitysService.findDistrictFacilitys(new DistrictKey(district.getCity(), - district.getRegion(), district.getName())); - int schoolAmount; - if (districtFacilitys != null && districtFacilitys.getSchool() != null) { - schoolAmount = districtFacilitys.getSchool().size(); - if (schoolAmount > 20) { - schoolAmount = 20; - } - } else { - schoolAmount = 0; - } - int busStationAmount; - if (districtFacilitys != null && districtFacilitys.getBus() != null) { - busStationAmount = districtFacilitys.getBus().size(); - } else { - busStationAmount = 0; - } + for (com.fangjia.service.bo.HouseBo bo : houseList) { + House house = bo.getHouse(); + HousePojo b = new HousePojo(); + b.setName(district.getName()); + b.setRegion(district.getRegion()); + b.setCity(DistrictCodeUtils.getCityCode(district.getCity())); + b.setListingPrice(house.getTotalPrice()); + b.setSize(house.getArea()); + b.setAddress(bo.getAddress() == null ? district.getAddress() : bo.getAddress()); + b.setMaxFloor(house.getHeight()); + b.setFloor(house.getFloor()); + b.setRoomAmount(house.getRoom()); + b.setHallAmount(house.getHall()); + b.setToiletAmount(house.getToilet()); + b.setPublishDate(house.getPublishDate()); + b.setEstateType(estateType); + b.setBuildingStructure(buildingStructure); + b.setBuildDate(buildDate); + b.setRemainUseYear(remainUseYear); + b.setManagementFee(district.getEstateCharge()); + b.setGreeningRatio(district.getVirescencePercent()); + b.setFloorAreaRatio(district.getCubagePercent()); + b.setMatchModel(matchModel); + if (showDetail) { + b.setUrl(house.getUrl()); + b.setUuid(house.getId()); + } + if (StringUtils.isNotBlank(district.getHouseProperty())) { + b.setHouseProperty(district.getHouseProperty()); + } + if (schoolAmount != 0) { + b.setSchoolAmount(schoolAmount); + } + if (busStationAmount != 0) { + b.setBusStationAmount(busStationAmount); + } + if (communityPrice != 0) { + b.setCommunityPrice(communityPrice); + } + if (metroStationAmount != 0) { + b.setMetroStationAmount(metroStationAmount); + } - int communityPrice = districtStatService.findLatestDistrictAvgPrice(district.getCity(), district.getRegion(), - district.getBlock(), district.getName()); - int metroStationAmount = 0; - if (district.getLng2() != null && district.getLat2() != null) { - List metroList = metroService - .findNearbyMetro(district.getCity(), district.getLng2(), district.getLat2(), 1000); - if (metroList != null) { - metroStationAmount = metroList.size(); - } - } - String buildDate = null, remainUseYear = null; - if (district.getBuildDate() != null || district.getFinishBuildingDate() != null || district.getLiveDate() != null || district.getOpenDate() != null) { - Integer minYear = getBuildYear(district.getFinishBuildingDate(), district.getLiveDate(), district.getBuildDate(),district.getOpenDate()); - if (minYear != null && minYear > 0) { - buildDate = minYear + "年"; - if (getHouseUseYear(minYear, district.getPropertyLife()) != null) { - remainUseYear = getHouseUseYear(minYear, district.getPropertyLife()) + "年";// 剩余使用年限 - } - } - } + String fitment = HouseValidator.fetchFitmentInfo(house.getFitment()); + if (fitment == null) { + b.setDecorationCost("4"); + } else { + b.setDecorationCost(FITMENT_CODE.get(fitment)); + if (b.getDecorationCost() == null) { + b.setDecorationCost("4"); + } + } + String direction = HouseValidator.fetchDirectionInfo(house.getDirection()); + if (direction == null) { + b.setDirection("6"); + } else { + if (DIRECTION_CODE.containsKey(direction)) { + b.setDirection(DIRECTION_CODE.get(direction)); + } else { + b.setDirection("6"); + } + } - for (com.fangjia.service.bo.HouseBo bo : houseList) { - House house = bo.getHouse(); - HousePojo b = new HousePojo(); - b.setName(district.getName()); - b.setRegion(district.getRegion()); - b.setCity(DistrictCodeUtils.getCityCode(district.getCity())); - b.setListingPrice(house.getTotalPrice()); - b.setSize(house.getArea()); - b.setAddress(bo.getAddress() == null ? district.getAddress() : bo.getAddress()); - b.setMaxFloor(house.getHeight()); - b.setFloor(house.getFloor()); - b.setRoomAmount(house.getRoom()); - b.setHallAmount(house.getHall()); - b.setToiletAmount(house.getToilet()); - b.setPublishDate(house.getPublishDate()); - b.setEstateType(estateType); - b.setBuildingStructure(buildingStructure); - b.setBuildDate(buildDate); - b.setRemainUseYear(remainUseYear); - b.setManagementFee(district.getEstateCharge()); - b.setGreeningRatio(district.getVirescencePercent()); - b.setFloorAreaRatio(district.getCubagePercent()); - b.setMatchModel(matchModel); - if (showDetail) { - b.setUrl(house.getUrl()); - b.setUuid(house.getId()); - } - if (StringUtils.isNotBlank(district.getHouseProperty())) { - b.setHouseProperty(district.getHouseProperty()); - } - if (schoolAmount != 0) { - b.setSchoolAmount(schoolAmount); - } - if (busStationAmount != 0) { - b.setBusStationAmount(busStationAmount); - } - if (communityPrice != 0) { - b.setCommunityPrice(communityPrice); - } - if (metroStationAmount != 0) { - b.setMetroStationAmount(metroStationAmount); - } - - String fitment = HouseValidator.fetchFitmentInfo(house.getFitment()); - if (fitment == null) { - b.setDecorationCost("4"); - } else { - b.setDecorationCost(FITMENT_CODE.get(fitment)); - if (b.getDecorationCost() == null) { - b.setDecorationCost("4"); - } - } - String direction = HouseValidator.fetchDirectionInfo(house.getDirection()); - if (direction == null) { - b.setDirection("6"); - } else { - if (DIRECTION_CODE.containsKey(direction)) { - b.setDirection(DIRECTION_CODE.get(direction)); - } else { - b.setDirection("6"); - } - } - - b.setPublishDate(generatorDate(endDate, house.getPublishDate()));// 发布时间 - b.setSource(getDomainName(house.getUrl())); - b.setBlock(house.getBlock()); + b.setPublishDate(generatorDate(endDate, house.getPublishDate()));// 发布时间 + b.setSource(getDomainName(house.getUrl())); + b.setBlock(house.getBlock()); // b.setBlock(DateUtil.formatByPattern(house.getPublishDate(), "yyyy-MM-dd")); - if (StringUtils.isBlank(house.getBuildType())) { - if (BULIDS_TYPE_CODE.containsKey(district.getBuildType())) { - b.setBuildingType(BULIDS_TYPE_CODE.get(district.getBuildType())); - } else { - b.setBuildingType("00"); - } - } else { - if (BULIDS_TYPE_CODE.containsKey(house.getBuildType())) { - b.setBuildingType(BULIDS_TYPE_CODE.get(house.getBuildType())); - } else { - b.setBuildingType("00"); - } - } - String houseType = getHouseType(bo.getHouse()); - if (StringUtils.isNotBlank(houseType)) { - b.setUnitType(houseType); - } - if (b.getSize() != null && b.getListingPrice() != null && b.getSize() != 0) { - b.setAveragePrice((int) (b.getListingPrice() / b.getSize())); - if (b.getAveragePrice() > 300000 || b.getAveragePrice() < 1000) { - continue; - } - } - if (HouseValidator.validateArea(b.getSize()) && !checkExists(list, b)) { - list.add(b); - } - } - return list; - } + if (StringUtils.isBlank(house.getBuildType())) { + if (BULIDS_TYPE_CODE.containsKey(district.getBuildType())) { + b.setBuildingType(BULIDS_TYPE_CODE.get(district.getBuildType())); + } else { + b.setBuildingType("00"); + } + } else { + if (BULIDS_TYPE_CODE.containsKey(house.getBuildType())) { + b.setBuildingType(BULIDS_TYPE_CODE.get(house.getBuildType())); + } else { + b.setBuildingType("00"); + } + } + String houseType = getHouseType(bo.getHouse()); + if (StringUtils.isNotBlank(houseType)) { + b.setUnitType(houseType); + } + if (b.getSize() != null && b.getListingPrice() != null && b.getSize() != 0) { + b.setAveragePrice((int) (b.getListingPrice() / b.getSize())); + if (b.getAveragePrice() > 300000 || b.getAveragePrice() < 1000) { + continue; + } + } + if (HouseValidator.validateArea(b.getSize()) && !checkExists(list, b)) { + list.add(b); + } + } + return list; + } - private Date generatorDate(Date endDate, Date publishDate) { + private Date generatorDate(Date endDate, Date publishDate) { // List months = DateUtil.getMonthList(new Date(), 6); // Date endMonthStartDate = DateUtil.getFirstDayOfMonth(months.get(0)); // long day1 = (endDate.getTime() - endMonthStartDate.getTime()) / (long)(24 * 3600 * 1000); @@ -1092,613 +1203,616 @@ public class HouseController { // long t1 = (long)(day1 * t2 / day2 * 0.5); // return DateUtil.getBeforeDay(endDate, (int)t1); - List months = DateUtil.getMonthList(new Date(), 6); - Date endMonthStartDate = DateUtil.getFirstDayOfMonth(months.get(0)); - long diffDay = (publishDate.getTime() - endMonthStartDate.getTime()) / (long)(24 * 3600 * 1000); - int df = (int) ((173 - diffDay) * 0.5); - if(df <= 0) { - df = 1; - } + List months = DateUtil.getMonthList(new Date(), 6); + Date endMonthStartDate = DateUtil.getFirstDayOfMonth(months.get(0)); + long diffDay = (publishDate.getTime() - endMonthStartDate.getTime()) / (long) (24 * 3600 * 1000); + int df = (int) ((173 - diffDay) * 0.5); + if (df <= 0) { + df = 1; + } - Date ret = DateUtil.getBeforeDay(endDate, (int)df); - return ret; - } + Date ret = DateUtil.getBeforeDay(endDate, (int) df); + return ret; + } - public void setSeawaterService(SeawaterService seawaterService) { - this.seawaterService = seawaterService; - } + public void setSeawaterService(SeawaterService seawaterService) { + this.seawaterService = seawaterService; + } - public void setSeawaterDao(SeawaterDao seawaterDao) { - this.seawaterDao = seawaterDao; - } + public void setSeawaterDao(SeawaterDao seawaterDao) { + this.seawaterDao = seawaterDao; + } - private boolean checkExists(FacetQueryResult houseBoList, HousePojo house) { - for (HousePojo bo : houseBoList) { - boolean sameName = bo.getName().equals(house.getName()); - boolean sameAddress = bo.getAddress() != null ? bo.getAddress().equals(house.getAddress()) - : house.getAddress() == null; - boolean sameTotalPrice = bo.getListingPrice() != null ? bo.getListingPrice().equals(house.getListingPrice()) : house - .getListingPrice() == null; - boolean samePublishDate = bo.getPublishDate() != null ? bo.getPublishDate().equals(house.getPublishDate()) : house - .getPublishDate() == null; - boolean sameArea = bo.getSize() != null ? bo.getSize().equals(house.getSize()) : house.getSize() == null; - boolean sameFloor = bo.getFloor() != null ? bo.getFloor().equals(house.getFloor()) : house.getFloor() == null; - if (sameName && sameAddress && sameFloor && sameTotalPrice && samePublishDate && sameArea) { - return true; - } - } - return false; - } + private boolean checkExists(FacetQueryResult houseBoList, HousePojo house) { + for (HousePojo bo : houseBoList) { + boolean sameName = bo.getName().equals(house.getName()); + boolean sameAddress = bo.getAddress() != null ? bo.getAddress().equals(house.getAddress()) + : house.getAddress() == null; + boolean sameTotalPrice = bo.getListingPrice() != null ? bo.getListingPrice().equals(house.getListingPrice()) : house + .getListingPrice() == null; + boolean samePublishDate = bo.getPublishDate() != null ? bo.getPublishDate().equals(house.getPublishDate()) : house + .getPublishDate() == null; + boolean sameArea = bo.getSize() != null ? bo.getSize().equals(house.getSize()) : house.getSize() == null; + boolean sameFloor = bo.getFloor() != null ? bo.getFloor().equals(house.getFloor()) : house.getFloor() == null; + if (sameName && sameAddress && sameFloor && sameTotalPrice && samePublishDate && sameArea) { + return true; + } + } + return false; + } - /** - * 查找小区房源 - * - * @param district - * @return - */ - private FacetQueryResult findDistrictHouses(District district, Date endDate) { - FacetQueryResult houseList = new FacetQueryResult(); - if (district == null) { - return houseList; - } - if (getRemainUseYear(district) == null) { - return houseList; - } - houseList = houseService.findHouses(district, endDate, 0, 50, INCLUDE_HOUSE_FIELDS); - if (!houseList.isEmpty()) { - return houseList; - } - return houseList; - } + /** + * 查找小区房源 + * + * @param district + * @return + */ + private FacetQueryResult findDistrictHouses(District district, Date endDate) { + FacetQueryResult houseList = new FacetQueryResult(); + if (district == null) { + return houseList; + } + if (getRemainUseYear(district) == null) { + return houseList; + } + houseList = houseService.findHouses(district, endDate, 0, 50, INCLUDE_HOUSE_FIELDS); + if (!houseList.isEmpty()) { + return houseList; + } + return houseList; + } - public Date getLatestStatIndex(String city) { - String now = DateUtil.formatByPattern(new Date(), "yyyyMMdd"); - if (CACHE_REFRESH_FLAG == null || !CACHE_REFRESH_FLAG.equals(now)) { - CACHE_REFRESH_FLAG = now; - STATS_INDEX_LATEST_DATE_CACHE.clear(); - } - if (STATS_INDEX_LATEST_DATE_CACHE.containsKey(city)) { - return STATS_INDEX_LATEST_DATE_CACHE.get(city); - } + public Date getLatestStatIndex(String city) { + String now = DateUtil.formatByPattern(new Date(), "yyyyMMdd"); + if (CACHE_REFRESH_FLAG == null || !CACHE_REFRESH_FLAG.equals(now)) { + CACHE_REFRESH_FLAG = now; + STATS_INDEX_LATEST_DATE_CACHE.clear(); + } + if (STATS_INDEX_LATEST_DATE_CACHE.containsKey(city)) { + return STATS_INDEX_LATEST_DATE_CACHE.get(city); + } - StatsIndex statsIndex = statsIndexService.findLatestStstsIndex(city, null, "district"); - STATS_INDEX_LATEST_DATE_CACHE.put(city, null); - if (statsIndex == null) { - return null; - } - if (statsIndex.getBelowFixedbase() == null || statsIndex.getBelowFixedbase() == null - || statsIndex.getBelowFixedbase() == null) { - return null; - } - Date endDate = DateUtil.parseDate(statsIndex.getYearmonth().toString(), "yyyyMM"); - Calendar c = Calendar.getInstance(); - c.setTime(endDate); - c.add(Calendar.MONTH, -1); - STATS_INDEX_LATEST_DATE_CACHE.put(city, c.getTime()); - return c.getTime(); - } + StatsIndex statsIndex = statsIndexService.findLatestStstsIndex(city, null, "district"); + STATS_INDEX_LATEST_DATE_CACHE.put(city, null); + if (statsIndex == null) { + return null; + } + if (statsIndex.getBelowFixedbase() == null || statsIndex.getBelowFixedbase() == null + || statsIndex.getBelowFixedbase() == null) { + return null; + } + Date endDate = DateUtil.parseDate(statsIndex.getYearmonth().toString(), "yyyyMM"); + Calendar c = Calendar.getInstance(); + c.setTime(endDate); + c.add(Calendar.MONTH, -1); + STATS_INDEX_LATEST_DATE_CACHE.put(city, c.getTime()); + return c.getTime(); + } - private void orderHouseList(FacetQueryResult houseBoList, final HouseSearchModel model) { - Integer floor = null; - final Double area = model.getSize(); - try { - floor = Integer.valueOf(model.getFloor()); - } catch (Exception e) { + private void orderHouseList(FacetQueryResult houseBoList, final HouseSearchModel model) { + Integer floor = null; + final Double area = model.getSize(); + try { + floor = Integer.valueOf(model.getFloor()); + } catch (Exception e) { - } + } - final Integer fFloor = floor; + final Integer fFloor = floor; - Collections.sort(houseBoList, new Comparator() { - @Override - public int compare(HousePojo o1, HousePojo o2) { - Double score1 = computeScore(o1); - Double score2 = computeScore(o2); - return score2.compareTo(score1); - } + Collections.sort(houseBoList, new Comparator() { + @Override + public int compare(HousePojo o1, HousePojo o2) { + Double score1 = computeScore(o1); + Double score2 = computeScore(o2); + return score2.compareTo(score1); + } - private double computeScore(HousePojo bo) { - double score = 0; - if (bo.getFloor() != null && fFloor != null) { - score += computeAreaScore(bo.getFloor(), fFloor) * 0.02; - } - if (bo.getSize() != null && area != null) { - score += computeAreaScore(bo.getSize(), area) * 0.98; - } - if ("普通住宅".equals(model.getEstateType()) && !isVilla(bo.getName(), bo.getMaxFloor(), bo.getFloor(), bo.getSize())) { - score += 1; - } else if ("别墅".equals(model.getEstateType()) - && isVilla(bo.getName(), bo.getMaxFloor(), bo.getFloor(), bo.getSize())) { - score += 1; - } + private double computeScore(HousePojo bo) { + double score = 0; + if (bo.getFloor() != null && fFloor != null) { + score += computeAreaScore(bo.getFloor(), fFloor) * 0.02; + } + if (bo.getSize() != null && area != null) { + score += computeAreaScore(bo.getSize(), area) * 0.98; + } + if ("普通住宅".equals(model.getEstateType()) && !isVilla(bo.getName(), bo.getMaxFloor(), bo.getFloor(), bo.getSize())) { + score += 1; + } else if ("别墅".equals(model.getEstateType()) + && isVilla(bo.getName(), bo.getMaxFloor(), bo.getFloor(), bo.getSize())) { + score += 1; + } - return score; - } + return score; + } - private double computeAreaScore(double a1, double a2) { - return 2 / (1 + Math.exp(Math.abs(1 - a1 / a2))); - } + private double computeAreaScore(double a1, double a2) { + return 2 / (1 + Math.exp(Math.abs(1 - a1 / a2))); + } - private boolean isVilla(String name, Integer maxFloor, Integer floor, Double size) { + private boolean isVilla(String name, Integer maxFloor, Integer floor, Double size) { - if (name != null && name.indexOf("别墅") > -1) { - return true; - } + if (name != null && name.indexOf("别墅") > -1) { + return true; + } - if (name != null && name.indexOf("别墅") > -1 && size != null && size > 180) { - return true; - } + if (name != null && name.indexOf("别墅") > -1 && size != null && size > 180) { + return true; + } - boolean flag = false; - if (maxFloor != null && maxFloor <= 4) { - if (size != null && size <= 100) { - if (size != null && size <= 50) { - flag = false; - } else { - if (maxFloor != null && maxFloor <= 0) { - if (floor != null && floor <= 0) { - if (size != null && size <= 93) { - if (size != null && size <= 88) { - flag = false; - } else { - flag = true; - } - } else { - flag = false; - } - } else { - flag = false; - } - } else { - if (floor != null && floor <= 2) { - if (size != null && size <= 98) { - flag = false; - } else { - flag = true; - } - } else { - if (maxFloor != null && maxFloor <= 3) { - flag = true; - } else { - if (floor != null && floor <= 3) { - flag = false; - } else { - flag = true; - } - } - } - } - } - } else { - flag = true; - } - } else { - if (size != null && size <= 178) { - if (size != null && size <= 143) { - flag = false; - } else { - if (maxFloor != null && maxFloor <= 8) { - if (floor != null && floor <= 2) { - flag = false; - } else { - if (maxFloor != null && maxFloor <= 5) { - if (size != null && size <= 146) { - flag = false; - } else { - if (size != null && size <= 160) { - if (size != null && size <= 158) { - if (size != null && size <= 148) { - flag = true; - } else { - flag = false; - } - } else { - flag = true; - } - } else { - flag = false; - } - } - } else { - flag = false; - } - } - } else { - flag = false; - } - } - } else { - if (size != null && size <= 300) { - if (maxFloor != null && maxFloor <= 14) { - if (size != null && size <= 200) { - if (floor != null && floor <= 4) { - if (floor != null && floor <= 3) { - if (floor != null && floor <= 2) { - flag = false; - } else { - if (maxFloor != null && maxFloor <= 5) { - flag = true; - } else { - flag = false; - } - } - } else { - flag = false; - } - } else { - if (maxFloor != null && maxFloor <= 5) { - if (size != null && size <= 192) { - flag = false; - } else { - flag = true; - } - } else { - if (maxFloor != null && maxFloor <= 8) { - if (floor != null && floor <= 6) { - flag = false; - } else { - flag = true; - } - } else { - flag = false; - } - } - } - } else { - if (maxFloor != null && maxFloor <= 5) { - if (floor != null && floor <= 4) { - if (floor != null && floor <= 3) { - if (floor != null && floor <= 1) { - flag = false; - } else { - flag = true; - } - } else { - flag = false; - } - } else { - flag = true; - } - } else { - if (maxFloor != null && maxFloor <= 10) { - if (maxFloor != null && maxFloor <= 6) { - if (size != null && size <= 223) { - if (floor != null && floor <= 1) { - flag = false; - } else { - if (size != null && size <= 206) { - flag = false; - } else { - if (size != null && size <= 215) { - flag = true; - } else { - flag = false; - } - } - } - } else { - if (floor != null && floor <= 5) { - if (floor != null && floor <= 3) { - if (floor != null && floor <= 1) { - flag = false; - } else { - flag = true; - } - } else { - flag = false; - } - } else { - flag = true; - } - } - } else { - if (size != null && size <= 267) { - if (size != null && size <= 219) { - if (size != null && size <= 208) { - flag = false; - } else { - if (size != null && size <= 214) { - flag = true; - } else { - flag = false; - } - } - } else { - flag = false; - } - } else { - if (floor != null && floor <= 4) { - flag = false; - } else { - if (size != null && size <= 286) { - flag = true; - } else { - flag = false; - } - } - } - } - } else { - if (size != null && size <= 252) { - if (size != null && size <= 249) { - if (size != null && size <= 204) { - flag = true; - } else { - if (floor != null && floor <= 2) { - flag = false; - } else { - if (maxFloor != null && maxFloor <= 11) { - flag = false; - } else { - if (size != null && size <= 228) { - flag = true; - } else { - flag = false; - } - } - } - } - } else { - flag = true; - } - } else { - flag = false; - } - } - } - } - } else { - flag = false; - } - } else { - if (size != null && size <= 340) { - if (maxFloor != null && maxFloor <= 5) { - flag = true; - } else { - if (size != null && size <= 323) { - flag = true; - } else { - flag = false; - } - } - } else { - flag = true; - } - } - } - } - return flag; - } + boolean flag = false; + if (maxFloor != null && maxFloor <= 4) { + if (size != null && size <= 100) { + if (size != null && size <= 50) { + flag = false; + } else { + if (maxFloor != null && maxFloor <= 0) { + if (floor != null && floor <= 0) { + if (size != null && size <= 93) { + if (size != null && size <= 88) { + flag = false; + } else { + flag = true; + } + } else { + flag = false; + } + } else { + flag = false; + } + } else { + if (floor != null && floor <= 2) { + if (size != null && size <= 98) { + flag = false; + } else { + flag = true; + } + } else { + if (maxFloor != null && maxFloor <= 3) { + flag = true; + } else { + if (floor != null && floor <= 3) { + flag = false; + } else { + flag = true; + } + } + } + } + } + } else { + flag = true; + } + } else { + if (size != null && size <= 178) { + if (size != null && size <= 143) { + flag = false; + } else { + if (maxFloor != null && maxFloor <= 8) { + if (floor != null && floor <= 2) { + flag = false; + } else { + if (maxFloor != null && maxFloor <= 5) { + if (size != null && size <= 146) { + flag = false; + } else { + if (size != null && size <= 160) { + if (size != null && size <= 158) { + if (size != null && size <= 148) { + flag = true; + } else { + flag = false; + } + } else { + flag = true; + } + } else { + flag = false; + } + } + } else { + flag = false; + } + } + } else { + flag = false; + } + } + } else { + if (size != null && size <= 300) { + if (maxFloor != null && maxFloor <= 14) { + if (size != null && size <= 200) { + if (floor != null && floor <= 4) { + if (floor != null && floor <= 3) { + if (floor != null && floor <= 2) { + flag = false; + } else { + if (maxFloor != null && maxFloor <= 5) { + flag = true; + } else { + flag = false; + } + } + } else { + flag = false; + } + } else { + if (maxFloor != null && maxFloor <= 5) { + if (size != null && size <= 192) { + flag = false; + } else { + flag = true; + } + } else { + if (maxFloor != null && maxFloor <= 8) { + if (floor != null && floor <= 6) { + flag = false; + } else { + flag = true; + } + } else { + flag = false; + } + } + } + } else { + if (maxFloor != null && maxFloor <= 5) { + if (floor != null && floor <= 4) { + if (floor != null && floor <= 3) { + if (floor != null && floor <= 1) { + flag = false; + } else { + flag = true; + } + } else { + flag = false; + } + } else { + flag = true; + } + } else { + if (maxFloor != null && maxFloor <= 10) { + if (maxFloor != null && maxFloor <= 6) { + if (size != null && size <= 223) { + if (floor != null && floor <= 1) { + flag = false; + } else { + if (size != null && size <= 206) { + flag = false; + } else { + if (size != null && size <= 215) { + flag = true; + } else { + flag = false; + } + } + } + } else { + if (floor != null && floor <= 5) { + if (floor != null && floor <= 3) { + if (floor != null && floor <= 1) { + flag = false; + } else { + flag = true; + } + } else { + flag = false; + } + } else { + flag = true; + } + } + } else { + if (size != null && size <= 267) { + if (size != null && size <= 219) { + if (size != null && size <= 208) { + flag = false; + } else { + if (size != null && size <= 214) { + flag = true; + } else { + flag = false; + } + } + } else { + flag = false; + } + } else { + if (floor != null && floor <= 4) { + flag = false; + } else { + if (size != null && size <= 286) { + flag = true; + } else { + flag = false; + } + } + } + } + } else { + if (size != null && size <= 252) { + if (size != null && size <= 249) { + if (size != null && size <= 204) { + flag = true; + } else { + if (floor != null && floor <= 2) { + flag = false; + } else { + if (maxFloor != null && maxFloor <= 11) { + flag = false; + } else { + if (size != null && size <= 228) { + flag = true; + } else { + flag = false; + } + } + } + } + } else { + flag = true; + } + } else { + flag = false; + } + } + } + } + } else { + flag = false; + } + } else { + if (size != null && size <= 340) { + if (maxFloor != null && maxFloor <= 5) { + flag = true; + } else { + if (size != null && size <= 323) { + flag = true; + } else { + flag = false; + } + } + } else { + flag = true; + } + } + } + } + return flag; + } - }); - } + }); + } - private String getHouseType(com.fangjia.dal.datastore.model.House bo) { - StringBuilder sb = new StringBuilder(); - if (bo.getRoom() != null) { - sb.append(bo.getRoom() + "室"); - } - if (bo.getHall() != null) { - sb.append(bo.getHall() + "厅"); - } - if (bo.getToilet() != null) { - sb.append(bo.getHall() + "卫"); - } - return sb.toString(); - } + private String getHouseType(com.fangjia.dal.datastore.model.House bo) { + StringBuilder sb = new StringBuilder(); + if (bo.getRoom() != null) { + sb.append(bo.getRoom() + "室"); + } + if (bo.getHall() != null) { + sb.append(bo.getHall() + "厅"); + } + if (bo.getToilet() != null) { + sb.append(bo.getHall() + "卫"); + } + return sb.toString(); + } - private Integer getYearFormDate(String dateStr) { - if (dateStr != null && StringUtils.isNotBlank(dateStr)) { - Date date = DateUtil.parseStringToDate(dateStr); - if (date != null) { - int year = date.getYear() + 1900; - return year; - } - } - return null; - } + private Integer getYearFormDate(String dateStr) { + if (dateStr != null && StringUtils.isNotBlank(dateStr)) { + Date date = DateUtil.parseStringToDate(dateStr); + if (date != null) { + int year = date.getYear() + 1900; + return year; + } + } + return null; + } - private Integer getBuildYear(String finishDate, String liveDate, String buildDate ,Date openDate) { + private Integer getBuildYear(String finishDate, String liveDate, String buildDate, Date openDate) { - Integer finishYear = getYearFormDate(finishDate); - Integer liveYear = getYearFormDate(liveDate); - Integer buildYear = getYearFormDate(buildDate); - Integer openYear = null; - if(openDate != null){ - openYear = Integer.valueOf(DateUtil.formatByPattern(openDate,"yyyy")); - } - int minYear = Integer.MAX_VALUE; - if (finishYear != null && finishYear < minYear) { - minYear = finishYear; - } - if (liveYear != null && liveYear < minYear) { - minYear = liveYear; - } - if (buildYear != null && buildYear < minYear) { - minYear = buildYear; - } - if(openYear != null && openYear < minYear){ - minYear = openYear; - } - if(minYear == Integer.MAX_VALUE){ - return null; - } - return minYear; - } + Integer finishYear = getYearFormDate(finishDate); + Integer liveYear = getYearFormDate(liveDate); + Integer buildYear = getYearFormDate(buildDate); + Integer openYear = null; + if (openDate != null) { + openYear = Integer.valueOf(DateUtil.formatByPattern(openDate, "yyyy")); + } + int minYear = Integer.MAX_VALUE; + if (finishYear != null && finishYear < minYear) { + minYear = finishYear; + } + if (liveYear != null && liveYear < minYear) { + minYear = liveYear; + } + if (buildYear != null && buildYear < minYear) { + minYear = buildYear; + } + if (openYear != null && openYear < minYear) { + minYear = openYear; + } + if (minYear == Integer.MAX_VALUE) { + return null; + } + return minYear; + } - private Integer getHouseUseYear(Integer minYear, String s){ + private Integer getHouseUseYear(Integer minYear, String s) { - if(StringUtils.isBlank(s)){ - return null; - } - if(minYear != null && minYear > 0){ - int curYear = new Date().getYear() + 1900; - int shengYuYear = curYear - minYear; - if( shengYuYear > 0 && shengYuYear <= 70){ - Integer year = extractYear(s); - if(year !=null && year > 0 && year <= 70){ - int useYear = year - shengYuYear; - if(year > 0 && year <= 70){ - return useYear; - } + if (StringUtils.isBlank(s)) { + return null; + } + if (minYear != null && minYear > 0) { + int curYear = new Date().getYear() + 1900; + int shengYuYear = curYear - minYear; + if (shengYuYear > 0 && shengYuYear <= 70) { + Integer year = extractYear(s); + if (year != null && year > 0 && year <= 70) { + int useYear = year - shengYuYear; + if (year > 0 && year <= 70) { + return useYear; + } - } - } - } - return null; - } + } + } + } + return null; + } - private Integer extractYear(String s) { - Pattern p = Pattern.compile("(\\d+)"); - Matcher m = p.matcher(s); - if (m.find()) { - return Integer.parseInt(m.group(1)); - } - return null; - } + private Integer extractYear(String s) { + Pattern p = Pattern.compile("(\\d+)"); + Matcher m = p.matcher(s); + if (m.find()) { + return Integer.parseInt(m.group(1)); + } + return null; + } - public String getDomainName(String url) { - if (StringUtils.isNotBlank(url)) { - Pattern p = Pattern.compile("[^//]*?\\.(com|cn|net|org|biz|info|cc|tv)", Pattern.CASE_INSENSITIVE); - Matcher matcher = p.matcher(url); - if (matcher.find()) { - return matcher.group(); - } + public String getDomainName(String url) { + if (StringUtils.isNotBlank(url)) { + Pattern p = Pattern.compile("[^//]*?\\.(com|cn|net|org|biz|info|cc|tv)", Pattern.CASE_INSENSITIVE); + Matcher matcher = p.matcher(url); + if (matcher.find()) { + return matcher.group(); + } - } - return "fangjia.com"; - } + } + return "fangjia.com"; + } - /** - * 新版token验证 - * - * @param token - * @return - */ - private ApiUser checkNewAuthorized(String token) { - Map tokenMap = FangjiaApiUtil.parseToken(token); - if (tokenMap == null) { - return null; - } - // token验证后,拿取出的字段再去数据库验证一遍 - if (StringUtils.isNotBlank(tokenMap.get("userid")) && !"null".equals(tokenMap.get("userid"))) { - List params = new ArrayList(); - params.add(new QueryParam("ID", tokenMap.get("userid"))); - ApiUser apiUser = apiUserService.findApiUserById(Long.parseLong(tokenMap.get("userid"))); - if (apiUser != null) { - if (tokenMap.get("appKey").equals(apiUser.getAppKey())) { - return apiUser; - } - } - } - return null; - } + /** + * 新版token验证 + * + * @param token + * @return + */ + private ApiUser checkNewAuthorized(String token) { + Map tokenMap = FangjiaApiUtil.parseToken(token); + if (tokenMap == null) { + return null; + } + // token验证后,拿取出的字段再去数据库验证一遍 + if (StringUtils.isNotBlank(tokenMap.get("userid")) && !"null".equals(tokenMap.get("userid"))) { + List params = new ArrayList(); + params.add(new QueryParam("ID", tokenMap.get("userid"))); + ApiUser apiUser = apiUserService.findApiUserById(Long.parseLong(tokenMap.get("userid"))); + if (apiUser != null) { + if (tokenMap.get("appKey").equals(apiUser.getAppKey())) { + return apiUser; + } + } + } + return null; + } - public AddressParser getAddressParser() { - return addressParser; - } + public AddressParser getAddressParser() { + return addressParser; + } - public void setAddressParser(AddressParser addressParser) { - this.addressParser = addressParser; - } + public void setAddressParser(AddressParser addressParser) { + this.addressParser = addressParser; + } - public HouseService getHouseService() { - return houseService; - } + public HouseService getHouseService() { + return houseService; + } - public void setHouseService(HouseService houseService) { - this.houseService = houseService; - } + public void setHouseService(HouseService houseService) { + this.houseService = houseService; + } - public MenuService getMenuService() { - return menuService; - } + public MenuService getMenuService() { + return menuService; + } - public void setMenuService(MenuService menuService) { - this.menuService = menuService; - } + public void setMenuService(MenuService menuService) { + this.menuService = menuService; + } - public DistrictService getDistrictService() { - return districtService; - } + public DistrictService getDistrictService() { + return districtService; + } - public void setDistrictService(DistrictService districtService) { - this.districtService = districtService; - } + public void setDistrictService(DistrictService districtService) { + this.districtService = districtService; + } - public void setNoHouseDistrictService(NoHouseDistrictService noHouseDistrictService) { - this.noHouseDistrictService = noHouseDistrictService; - } + public void setNoHouseDistrictService(NoHouseDistrictService noHouseDistrictService) { + this.noHouseDistrictService = noHouseDistrictService; + } - public void setApiUserService(ApiUserService apiUserService) { - this.apiUserService = apiUserService; - } + public void setApiUserService(ApiUserService apiUserService) { + this.apiUserService = apiUserService; + } - public void setUserService(UserService userService) { - this.userService = userService; - } + public void setUserService(UserService userService) { + this.userService = userService; + } - public void setDistrictStatService(DistrictStatService districtStatService) { - this.districtStatService = districtStatService; - } + public void setDistrictStatService(DistrictStatService districtStatService) { + this.districtStatService = districtStatService; + } - public void setDistrictFacilitysService(DistrictFacilitysService districtFacilitysService) { - this.districtFacilitysService = districtFacilitysService; - } + public void setDistrictFacilitysService(DistrictFacilitysService districtFacilitysService) { + this.districtFacilitysService = districtFacilitysService; + } - public void setDealPriceService(DealPriceService dealPriceService) { - } + public void setDealPriceService(DealPriceService dealPriceService) { + } - public void setMetroService(MetroService metroService) { - this.metroService = metroService; - } + public void setMetroService(MetroService metroService) { + this.metroService = metroService; + } - public static String getEstateType(String code) { - for (Map.Entry entry : ESTATE_TYPE_CODE.entrySet()) { - if (entry.getValue().equals(code)) { - return entry.getKey(); - } - } - return null; - } + public static String getEstateType(String code) { + for (Map.Entry entry : ESTATE_TYPE_CODE.entrySet()) { + if (entry.getValue().equals(code)) { + return entry.getKey(); + } + } + return null; + } - public static String getBulidType(String code) { - for (Map.Entry entry : BULIDS_TYPE_CODE.entrySet()) { - if (entry.getValue().equals(code)) { - return entry.getKey(); - } - } - return null; - } + public static String getBulidType(String code) { + for (Map.Entry entry : BULIDS_TYPE_CODE.entrySet()) { + if (entry.getValue().equals(code)) { + return entry.getKey(); + } + } + return null; + } - public void setStatsIndexService(StatsIndexService statsIndexService) { - this.statsIndexService = statsIndexService; - } + public void setStatsIndexService(StatsIndexService statsIndexService) { + this.statsIndexService = statsIndexService; + } - private Integer getRemainUseYear(District district) { - if("苏州".equals(district.getCity())){ - if("商住".equals(district.getEstateType2())){ - district.setPropertyLife("47"); - }else{ - district.setPropertyLife("67"); - } - } - if (district.getBuildDate() != null || district.getFinishBuildingDate() != null || district.getLiveDate() != null || district.getOpenDate() != null) { - Integer minYear = getBuildYear(district.getFinishBuildingDate(), district.getLiveDate(), district.getBuildDate(), district.getOpenDate()); - Integer useYear = getHouseUseYear(minYear, district.getPropertyLife()); - if (useYear != null && useYear > 0 && useYear < 70) { - return useYear; - } - } - return null; - } + private Integer getRemainUseYear(District district) { + if ("苏州".equals(district.getCity())) { + if ("商住".equals(district.getEstateType2())) { + district.setPropertyLife("47"); + } else { + district.setPropertyLife("67"); + } + } + if (district.getBuildDate() != null || district.getFinishBuildingDate() != null || district.getLiveDate() != null || district.getOpenDate() != null) { + Integer minYear = getBuildYear(district.getFinishBuildingDate(), district.getLiveDate(), district.getBuildDate(), district.getOpenDate()); + Integer useYear = getHouseUseYear(minYear, district.getPropertyLife()); + if (useYear != null && useYear > 0 && useYear < 70) { + return useYear; + } + } + return null; + } - public void setCzbankSampleService(CzbankSampleService czbankSampleService) { - this.czbankSampleService = czbankSampleService; - } + public void setCzbankSampleService(CzbankSampleService czbankSampleService) { + this.czbankSampleService = czbankSampleService; + } - public void setFangjiaOfficialAreaService(FangjiaOfficialAreaService fangjiaOfficialAreaService) { - this.fangjiaOfficialAreaService = fangjiaOfficialAreaService; - } + public void setFangjiaOfficialAreaService(FangjiaOfficialAreaService fangjiaOfficialAreaService) { + this.fangjiaOfficialAreaService = fangjiaOfficialAreaService; + } + public void setSeaweedService(SeaweedService seaweedService) { + this.seaweedService = seaweedService; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java index 63a85c4b3..a78519c7a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java @@ -13,6 +13,16 @@ public class HouseSearchModel extends SearchModel { private String unitNo; private Double size; private Boolean showDetail; + + private String city; + + private String location; + + private String locationType; + + private String propertyType; + + private String houseType; @Override public QueryBean getQueryBean() { HouseQueryBean queryBean = new HouseQueryBean(); @@ -125,4 +135,46 @@ public class HouseSearchModel extends SearchModel { public void setId(String id) { this.id = id; } + + @Override + public String getCity() { + return city; + } + + @Override + public void setCity(String city) { + this.city = city; + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } + + public String getLocationType() { + return locationType; + } + + public void setLocationType(String locationType) { + this.locationType = locationType; + } + + public String getPropertyType() { + return propertyType; + } + + public void setPropertyType(String propertyType) { + this.propertyType = propertyType; + } + + public String getHouseType() { + return houseType; + } + + public void setHouseType(String houseType) { + this.houseType = houseType; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java index a8417686c..a120b7d14 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java @@ -1535,15 +1535,23 @@ public class DistrictServiceImpl implements DistrictService { List ret = new ArrayList(); for (District d : districts) { - if (null == d.getLat2() || null == d.getLng2()) { + if (d.getLat2() == null || d.getLng2() == null) { continue; } double dis = GeoUtils.calculateDistance(lng, lat, d.getLng() / 10000000000.0, d.getLat() / 10000000000.0); if (dis <= radius) { + d.setScore(dis); // Assuming District has a `distance` field to store the calculated distance. ret.add(d); } } + + Collections.sort(ret, new Comparator() { + @Override + public int compare(District d1, District d2) { + return Double.compare(d1.getScore(), d2.getScore()); + } + }); return ret; } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/SeaweedService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/SeaweedService.java new file mode 100644 index 000000000..ea250dfc9 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/SeaweedService.java @@ -0,0 +1,13 @@ +package com.fangjia.service.datastore; + +import com.fangjia.dal.QueryParam; +import com.fangjia.dal.common.DistrictKey; +import com.fangjia.dal.seaweed.model.Seaweed; +import com.fangjia.dal.seaweed.model.Shop; + +import java.util.List; + +public interface SeaweedService { + List findSeaweedByLocation(double lat, double lng, double radius,String cat,int limit); + List findSeaweedByLocation(double lat, double lng, double radius,String cat); +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/SeaweedServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/SeaweedServiceImpl.java new file mode 100644 index 000000000..e054a7663 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/SeaweedServiceImpl.java @@ -0,0 +1,102 @@ +package com.fangjia.service.datastore; + +import com.fangjia.core.util.CacheUtils; +import com.fangjia.core.util.CacheUtils.CachePolicyEnum; +import com.fangjia.core.util.GeoUtils; +import com.fangjia.dal.QueryParam; +import com.fangjia.dal.common.DistrictKey; +import com.fangjia.dal.seaweed.dao.SeaweedDao; +import com.fangjia.dal.seaweed.dao.ShopDao; +import com.fangjia.dal.seaweed.model.District; +import com.fangjia.dal.seaweed.model.Seaweed; +import com.fangjia.dal.seaweed.model.Shop; +import com.fangjia.service.index.BoostQueryPolicy; +import org.apache.commons.lang.StringUtils; +import org.sothis.core.util.Closure; +import org.sothis.core.util.CollectionUtils; + +import java.util.*; + +public class SeaweedServiceImpl implements SeaweedService { + private SeaweedDao seaweedDao; + + @Override + public List findSeaweedByLocation(double lat, double lng, double radius,String cat,int limit) { + double[] latlngs = GeoUtils.getAround(lat, lng, radius); + List params = new ArrayList(); + params.add(new QueryParam("category", cat)); + params.add(new QueryParam("status", 0)); + params.add(new QueryParam("lat", QueryParam.GREATER_THAN_EQUAL_OPERATOR, latlngs[0] * 10000000000d)); + params.add(new QueryParam("lat", QueryParam.LESS_THAN_EQUAL_OPERATOR, latlngs[1] * 10000000000d)); + params.add(new QueryParam("lng", QueryParam.GREATER_THAN_EQUAL_OPERATOR, latlngs[2] * 10000000000d)); + params.add(new QueryParam("lng", QueryParam.LESS_THAN_EQUAL_OPERATOR, latlngs[3] * 10000000000d)); + + List seaweeds = seaweedDao.findAllByParams(params,limit); + if (CollectionUtils.isEmpty(seaweeds)) { + return Collections.emptyList(); + } + + List ret = new ArrayList(); + for (Seaweed d : seaweeds) { + if (d.getLat() == null || d.getLng() == null) { + continue; + } + + double dis = GeoUtils.calculateDistance(lng, lat, d.getLng() / 10000000000.0, d.getLat() / 10000000000.0); + if (dis <= radius) { + d.setScore(dis); // Assuming District has a `distance` field to store the calculated distance. + ret.add(d); + } + } + + Collections.sort(ret, new Comparator() { + @Override + public int compare(Seaweed d1, Seaweed d2) { + return Double.compare(d1.getScore(), d2.getScore()); + } + }); + return ret; + } + + @Override + public List findSeaweedByLocation(double lat, double lng, double radius, String cat) { + double[] latlngs = GeoUtils.getAround(lat, lng, radius); + List params = new ArrayList(); + params.add(new QueryParam("category", cat)); + params.add(new QueryParam("status", 0)); + params.add(new QueryParam("lat", QueryParam.GREATER_THAN_EQUAL_OPERATOR, latlngs[0] * 10000000000d)); + params.add(new QueryParam("lat", QueryParam.LESS_THAN_EQUAL_OPERATOR, latlngs[1] * 10000000000d)); + params.add(new QueryParam("lng", QueryParam.GREATER_THAN_EQUAL_OPERATOR, latlngs[2] * 10000000000d)); + params.add(new QueryParam("lng", QueryParam.LESS_THAN_EQUAL_OPERATOR, latlngs[3] * 10000000000d)); + + List seaweeds = seaweedDao.findAllByParams(params); + if (CollectionUtils.isEmpty(seaweeds)) { + return Collections.emptyList(); + } + + List ret = new ArrayList(); + for (Seaweed d : seaweeds) { + if (d.getLat() == null || d.getLng() == null) { + continue; + } + + double dis = GeoUtils.calculateDistance(lng, lat, d.getLng() / 10000000000.0, d.getLat() / 10000000000.0); + if (dis <= radius) { + d.setScore(dis); // Assuming District has a `distance` field to store the calculated distance. + ret.add(d); + } + } + + Collections.sort(ret, new Comparator() { + @Override + public int compare(Seaweed d1, Seaweed d2) { + return Double.compare(d1.getScore(), d2.getScore()); + } + }); + return ret; + } + + public void setSeaweedDao(SeaweedDao seaweedDao) { + this.seaweedDao = seaweedDao; + } +}