diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java index 0248a92da..93218b265 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java @@ -312,25 +312,6 @@ public class DataUtil { return ret; } - /** - * 加密图片url - * - * @param u - * @param s - * @param t - * @return - */ - public static String encodePicUrl(String u, String s, String t) { - if (StringUtils.isBlank(u)) { - return StringUtils.EMPTY; - } - try { - return SecurityUtil.encode("u=" + URLEncoder.encode(u, "UTF-8") + "&s=" + s + "&t=" + t); - } catch (UnsupportedEncodingException e) { - return SecurityUtil.encode("u=" + u + "&s=" + s + "&t=" + t); - } - } - /** * 把字符串以16进制数值显示出来 * @@ -1805,6 +1786,25 @@ public class DataUtil { return b2.toString(); } + /** + * 加密图片url + * + * @param u + * @param s + * @param t + * @return + */ + public static String encodePicUrl(String u, String s, String t) { + if (StringUtils.isBlank(u)) { + return StringUtils.EMPTY; + } + try { + return SecurityUtil.encode("u=" + URLEncoder.encode(u, "UTF-8") + "&s=" + s + "&t=" + t); + } catch (UnsupportedEncodingException e) { + return SecurityUtil.encode("u=" + u + "&s=" + s + "&t=" + t); + } + } + public static void main(String[] args) { System.out.println(getFirstChar("文裕花园")); System.out.println(getFirstChar("文怡花园")); diff --git a/projects/fangjia-dal/pom.xml b/projects/fangjia-dal/pom.xml index b88eb7a4e..b5da0436e 100644 --- a/projects/fangjia-dal/pom.xml +++ b/projects/fangjia-dal/pom.xml @@ -33,7 +33,7 @@ org.sothis sothis-core - 0.2.0-SNAPSHOT + 0.2.0 provided diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictRoomSqmetreRentDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictRoomSqmetreRentDao.java new file mode 100644 index 000000000..499d0f1a7 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictRoomSqmetreRentDao.java @@ -0,0 +1,8 @@ +package com.fangjia.dal.mongo.dao; + +import com.fangjia.dal.MongoDao; +import com.fangjia.dal.mongo.model.DistrictRoomSqmetreRent; + + +public interface DistrictRoomSqmetreRentDao extends MongoDao { +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictRoomSqmetreRentDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictRoomSqmetreRentDaoImpl.java new file mode 100644 index 000000000..caadfd2ec --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictRoomSqmetreRentDaoImpl.java @@ -0,0 +1,8 @@ +package com.fangjia.dal.mongo.dao; + +import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.mongo.model.DistrictRoomSqmetreRent; +import com.fangjia.dal.mongo.model.bkoff.DistrictRentCoverage; + +public class DistrictRoomSqmetreRentDaoImpl extends MongoDaoImpl implements DistrictRoomSqmetreRentDao{ +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RentDealPriceDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RentDealPriceDao.java new file mode 100644 index 000000000..e5a36f3b4 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RentDealPriceDao.java @@ -0,0 +1,8 @@ +package com.fangjia.dal.mongo.dao; + +import com.fangjia.dal.MongoDao; +import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.mongo.model.RentDealPrice; + +public interface RentDealPriceDao extends MongoDao { +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RentDealPriceDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RentDealPriceDaoImpl.java new file mode 100644 index 000000000..0064989a5 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RentDealPriceDaoImpl.java @@ -0,0 +1,7 @@ +package com.fangjia.dal.mongo.dao; + +import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.mongo.model.RentDealPrice; + +public class RentDealPriceDaoImpl extends MongoDaoImpl implements RentDealPriceDao{ +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictRoomSqmetreRent.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictRoomSqmetreRent.java new file mode 100644 index 000000000..b4b9a0ea4 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictRoomSqmetreRent.java @@ -0,0 +1,126 @@ +package com.fangjia.dal.mongo.model; + +import com.fangjia.dal.MongoEntity; + +import javax.persistence.*; +import java.util.Date; + +@Entity +@Table(name = "fangjia.district_room_sqmetre_rent") +public class DistrictRoomSqmetreRent implements MongoEntity { + + private String id; + private String city; + private String region; + private String block; + private String districtName; + private int avgPrice; + private String estateType; + private Integer houseType; + private int markup; + private Date creationDate; + private int sDate; + + @Override + @Id + @GeneratedValue + @Column(name = "_id", unique = true, nullable = false) + public String getId() { + return id; + } + + @Override + public void setId(String id) { + this.id = id; + } + + @Column(name = "city") + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + @Column(name = "region") + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + @Column(name = "block") + public String getBlock() { + return block; + } + + public void setBlock(String block) { + this.block = block; + } + + @Column(name = "district_name") + public String getDistrictName() { + return districtName; + } + + public void setDistrictName(String districtName) { + this.districtName = districtName; + } + + @Column(name = "avg_price") + public int getAvgPrice() { + return avgPrice; + } + + public void setAvgPrice(int avgPrice) { + this.avgPrice = avgPrice; + } + + @Column(name = "estate_type") + public String getEstateType() { + return estateType; + } + + public void setEstateType(String estateType) { + this.estateType = estateType; + } + + @Column(name = "house_type") + public Integer getHouseType() { + return houseType; + } + + public void setHouseType(Integer houseType) { + this.houseType = houseType; + } + + @Column(name = "markup") + public int getMarkup() { + return markup; + } + + public void setMarkup(int markup) { + this.markup = markup; + } + + @Column(name = "c_date") + public Date getCreationDate() { + return creationDate; + } + + public void setCreationDate(Date creationDate) { + this.creationDate = creationDate; + } + + @Column(name = "s_date") + public int getsDate() { + return sDate; + } + + public void setsDate(int sDate) { + this.sDate = sDate; + } +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RentDealPrice.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RentDealPrice.java new file mode 100644 index 000000000..f10e3e156 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/RentDealPrice.java @@ -0,0 +1,200 @@ +package com.fangjia.dal.mongo.model; + +import com.fangjia.dal.MongoEntity; + +import javax.persistence.*; +import java.util.Date; + +@Entity +@Table(name = "fangjia.rent_deal_price") +public class RentDealPrice implements MongoEntity { + + private String id; + private String city; + private String region; + private String districtName; + private Double area; + private Integer totalPrice; + private Integer avgPrice; + private String source; + private Integer room; + private Integer hall; + private Integer toilet; + private String fitment; + private String url; + private String direction; + private Integer height; + private Date modificationDate; + private Date tradeDate; + private Date createDate; + + + @Override + @Id + @GeneratedValue + @Column(name = "_id", unique = true, nullable = false) + public String getId() { + return id; + } + + @Override + public void setId(String id) { + this.id = id; + } + + + @Column(name = "city") + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + @Column(name = "region") + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + @Column(name = "district_name") + public String getDistrictName() { + return districtName; + } + + public void setDistrictName(String districtName) { + this.districtName = districtName; + } + + @Column(name = "area") + public Double getArea() { + return area; + } + + public void setArea(Double area) { + this.area = area; + } + + @Column(name = "total_price") + public Integer getTotalPrice() { + return totalPrice; + } + + public void setTotalPrice(Integer totalPrice) { + this.totalPrice = totalPrice; + } + + @Column(name = "avg_price") + public Integer getAvgPrice() { + return avgPrice; + } + + public void setAvgPrice(Integer avgPrice) { + this.avgPrice = avgPrice; + } + + @Column(name = "source") + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + @Column(name = "room") + public Integer getRoom() { + return room; + } + + public void setRoom(Integer room) { + this.room = room; + } + + @Column(name = "hall") + public Integer getHall() { + return hall; + } + + public void setHall(Integer hall) { + this.hall = hall; + } + + @Column(name = "toilet") + public Integer getToilet() { + return toilet; + } + + public void setToilet(Integer toilet) { + this.toilet = toilet; + } + + @Column(name = "fitment") + public String getFitment() { + return fitment; + } + + public void setFitment(String fitment) { + this.fitment = fitment; + } + + @Column(name = "url") + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + @Column(name = "direction") + public String getDirection() { + return direction; + } + + + public void setDirection(String direction) { + this.direction = direction; + } + + @Column(name = "height") + public Integer getHeight() { + return height; + } + + public void setHeight(Integer height) { + this.height = height; + } + + + @Column(name = "trade_date") + public Date getTradeDate() { + return tradeDate; + } + + public void setTradeDate(Date tradeDate) { + this.tradeDate = tradeDate; + } + + @Column(name = "create_date") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name = "m_date") + public Date getModificationDate() { + return modificationDate; + } + + public void setModificationDate(Date modificationDate) { + this.modificationDate = modificationDate; + } +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java index 56a5c9577..dd28f68b7 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java @@ -13,10 +13,10 @@ public interface SeawaterDao extends com.fangjia.dal.SeawaterDao { Integer room, String root,String table); Seawater findByIdFromEs(String id,String table); - - List findSeawatersFromEs(String category, String city, String region, String name, - List alias, List regionAlias, Integer startDate, Integer endDate, Integer room, String root, - String sort, boolean order, int start, int limit, String[] keys,String table); + + + List findSeawatersFromEs(String category, String city, String region, String name, List alias, List regionAlias, Integer startDate, Integer endDate, + Double startArea, Double endArea, Integer startPrice, Integer endPrice, Integer room, String root, String sort, boolean order, int start, int limit , String table); List findHouses(String city, String region, List alias, Integer minPrice, Integer maxPrice, Integer limit); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java index d2dccb33a..5fac9cbef 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java @@ -29,7 +29,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i @Override public Seawater findByIdFromEs(String id,String table) { Seawater seawater = null; - List jsonList = queryList(id,null,null,null,null,null,null,null,null,null,null,null,false,-1,-1,table); + List jsonList = queryList(id,null,null,null,null,null,null,null,null, null, null, null, null, null,null,null,false,-1,-1,table); if(jsonList == null){ return null; }else{ @@ -42,11 +42,9 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i } @Override - public List findSeawatersFromEs(String category, String city, String region, String name, - List alias, List regionAlias, Integer startDate, Integer endDate, Integer room, String root, - String sort, boolean order, int start, int limit, String[] keys,String table) { + public List findSeawatersFromEs(String category, String city, String region, String name, List alias, List regionAlias, Integer startDate, Integer endDate, Double startArea, Double endArea, Integer startPrice, Integer endPrice, Integer room, String root, String sort, boolean order, int start, int limit, String table) { List seawaterList= new ArrayList(); - List jsonList = queryList(null,category,city,region,name,alias,regionAlias,startDate,endDate,room,root,sort,order,start,limit,table); + List jsonList = queryList(null,category,city,region,name,alias,regionAlias,startDate,endDate, startArea, endArea, startPrice, endPrice, room,root,sort,order,start,limit,table); if(jsonList == null){ return null; }else{ @@ -55,6 +53,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i return seawaterList; } + @Override public List findHouses(String city, String region, List alias, Integer minPrice, Integer maxPrice, Integer limit) { JSONObject reqBody = new JSONObject(); @@ -200,7 +199,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i } private JSONObject query(String id,String category, String city, String region, String name, List alias, - List regionAlias, Integer startDate, Integer endDate, Integer room, String root,String sort, boolean order, int start, int limit,String table){ + List regionAlias, Integer startDate, Integer endDate, Double startArea, Double endArea, Integer startPrice, Integer endPrice, Integer room, String root,String sort, boolean order, int start, int limit,String table){ long time1 = System.currentTimeMillis(); JSONObject reqBody = new JSONObject(); JSONObject q = new JSONObject(); @@ -287,6 +286,37 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i temp.put("range", param); jsonList.add(temp); } + + + if(startArea != null || endArea != null){ + JSONObject param = new JSONObject(); + JSONObject temp = new JSONObject(); + JSONObject temp2 = new JSONObject(); + if(startArea != null){ + temp2.put("gte", startArea); + } + if(endArea != null){ + temp2.put("lte", endArea); + } + param.put("area", temp2); + temp.put("range", param); + jsonList.add(temp); + } + + if(startPrice != null || endPrice != null){ + JSONObject param = new JSONObject(); + JSONObject temp = new JSONObject(); + JSONObject temp2 = new JSONObject(); + if(startPrice != null){ + temp2.put("gte", startPrice); + } + if(endPrice != null){ + temp2.put("lte", endPrice); + } + param.put("total_price", temp2); + temp.put("range", param); + jsonList.add(temp); + } if(StringUtils.isNotBlank(sort)){ JSONObject jsonOrder = new JSONObject(); @@ -331,8 +361,8 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i } private List queryList(String id,String category, String city, String region, String name, List alias, - List regionAlias, Integer startDate, Integer endDate, Integer room, String root,String sort, boolean order, int start, int limit,String table){ - JSONObject json = query(id,category,city,region,name,alias,regionAlias,startDate,endDate,room,root,sort,order,start,limit,table); + List regionAlias, Integer startDate, Integer endDate, Double startArea, Double endArea, Integer startPrice, Integer endPrice, Integer room, String root,String sort, boolean order, int start, int limit,String table){ + JSONObject json = query(id,category,city,region,name,alias,regionAlias,startDate,endDate, startArea, endArea, startPrice, endPrice, room,root,sort,order,start,limit,table); if(!json.containsKey("hits") || !json.getJSONObject("hits").containsKey("hits")){ return null; } @@ -347,7 +377,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i private int queryCount(String id,String category, String city, String region, String name, List alias, List regionAlias, Integer startDate, Integer endDate, Integer room, String root,String sort, boolean order, int start, int limit,String table){ - JSONObject json = query(id,category,city,region,name,alias,regionAlias,startDate,endDate,room,root,sort,order,start,limit,table); + JSONObject json = query(id,category,city,region,name,alias,regionAlias,startDate,endDate,null, null, null, null, room,root,sort,order,start,limit,table); if(!json.containsKey("hits") || !json.getJSONObject("hits").containsKey("total")){ return 0; } diff --git a/projects/fangjia-open/pom.xml b/projects/fangjia-open/pom.xml index 6edd92db1..3d34afcdd 100644 --- a/projects/fangjia-open/pom.xml +++ b/projects/fangjia-open/pom.xml @@ -147,5 +147,23 @@ 1.0.0 jdk18 + + + org.xhtmlrenderer + core-renderer + R8 + + + + org.jfree + jfreechart + 1.5.3 + + + org.sothis + sothis-core + 0.1.0-SNAPSHOT + compile + diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index acf9c9b6f..d9287fdaf 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java @@ -1765,13 +1765,14 @@ public class AddressController { dto.append("township", address.getTownship()); dto.append("street", address.getStreet()); dto.append("streetNumber", address.getStreetNumber()); - dto.append("name", building.getSuggestName()); if(StringUtils.isBlank(building.getSuggestName())){ if(StringUtils.isNotBlank(address.getParsedPropertyName())){ dto.append("name", address.getParsedPropertyName()); }else if(StringUtils.isNotBlank(address.getOrgKeywords())){ dto.append("name", address.getOrgKeywords()); } + }else{ + dto.append("name", building.getSuggestName()); } if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){ String addr = building.getAddress(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 774e9d9e2..5f3343578 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -28,11 +28,16 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import com.fangjia.core.util.*; import com.fangjia.dal.*; import com.fangjia.dal.mongo.model.*; import com.fangjia.dal.seawater.dao.SeawaterDao; import com.fangjia.dal.seawater.model.Seawater; +import com.fangjia.open.dto.*; +import com.fangjia.service.district.*; +import com.fangjia.service.mongo.fangjia.*; import com.fangjia.service.open.*; +import com.fangjia.service.util.DistrictScoreUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -56,16 +61,6 @@ import org.sothis.web.mvc.annotation.Param; import org.springframework.web.multipart.MultipartFile; import com.fangjia.core.RegionData; -import com.fangjia.core.util.AnalyticsUtil; -import com.fangjia.core.util.CoordPoint; -import com.fangjia.core.util.CoordinateConversion; -import com.fangjia.core.util.DataUtil; -import com.fangjia.core.util.DateUtil; -import com.fangjia.core.util.GeoUtils; -import com.fangjia.core.util.GeocodeUtils; -import com.fangjia.core.util.HouseValidator; -import com.fangjia.core.util.LoggerFactory; -import com.fangjia.core.util.SecurityUtil; import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.common.ServerAreaData; import com.fangjia.dal.datastore.model.House; @@ -81,21 +76,6 @@ import com.fangjia.dal.sql.model.FjtEvaluation; import com.fangjia.dal.sql.model.User; import com.fangjia.open.APIConstant; import com.fangjia.open.FangjiaApiUtil; -import com.fangjia.open.dto.AroundDto; -import com.fangjia.open.dto.BuildingDto; -import com.fangjia.open.dto.DistrictAnalysisDto; -import com.fangjia.open.dto.DistrictInfoDto; -import com.fangjia.open.dto.FloorPlanDto; -import com.fangjia.open.dto.HouseAuctionDetailDto; -import com.fangjia.open.dto.HouseAuctionDto; -import com.fangjia.open.dto.HouseDealPriceDetailDto; -import com.fangjia.open.dto.HouseDealPriceDto; -import com.fangjia.open.dto.HouseEvaluateNumDto; -import com.fangjia.open.dto.PropertyDto; -import com.fangjia.open.dto.RoomDto; -import com.fangjia.open.dto.StationDto; -import com.fangjia.open.dto.UnitNumberDto; -import com.fangjia.open.dto.UniversalDto; import com.fangjia.open.interceptors.AuthenticationBean; import com.fangjia.open.interceptors.Authority; import com.fangjia.open.interceptors.Role; @@ -137,24 +117,9 @@ import com.fangjia.service.datastore.FieldFilterService; import com.fangjia.service.datastore.HouseService; import com.fangjia.service.datastore.NoHouseDistrictService; import com.fangjia.service.datastore.OpenApiLogService; -import com.fangjia.service.district.DistrictStatRentService; -import com.fangjia.service.district.DistrictStatService; import com.fangjia.service.mongo.bkoff.HouseAuctionService; import com.fangjia.service.mongo.bkoff.HouseLoudongService; import com.fangjia.service.mongo.bkoff.LoudongService; -import com.fangjia.service.mongo.fangjia.AddressMatchLogService; -import com.fangjia.service.mongo.fangjia.AverageAnalyService; -import com.fangjia.service.mongo.fangjia.AverageStatisticsService; -import com.fangjia.service.mongo.fangjia.BatchEvaluateService; -import com.fangjia.service.mongo.fangjia.BizShopService; -import com.fangjia.service.mongo.fangjia.BusStationService; -import com.fangjia.service.mongo.fangjia.CityHotService; -import com.fangjia.service.mongo.fangjia.DealPriceService; -import com.fangjia.service.mongo.fangjia.DistrictAttentionRankService; -import com.fangjia.service.mongo.fangjia.DistrictHotService; -import com.fangjia.service.mongo.fangjia.DistrictHouseResourceStatService; -import com.fangjia.service.mongo.fangjia.NetworkPriceService; -import com.fangjia.service.mongo.fangjia.ServerAreaService; import com.fangjia.service.sql.ApiUserService; import com.fangjia.service.sql.FjtEvaluationService; import com.fangjia.service.sql.UserService; @@ -166,7 +131,7 @@ import com.google.common.collect.Sets; import com.mongodb.BasicDBObject; import com.mongodb.DBObject; -@Authority(role = Role.USER) +//@Authority(role = Role.USER) public class PropertyController { private static final Logger LOGGER = LoggerFactory.getLogger(PropertyController.class); @@ -208,6 +173,8 @@ public class PropertyController { private FangjiaOfficialAreaService fangjiaOfficialAreaService; private RegionAnaDataService regionAnaDataService; private SeawaterDao seawaterDao; + private SeawaterService seawaterService; + private SqmetreRentService sqmetreRentService; private FileDao fileDao = FileDao.getInstance(); private static final int DEFAULT_PAGE_SIZE = 20; @@ -217,6 +184,10 @@ public class PropertyController { private AutoCompleteService autoCompleteService; + + private DistrictRoomSqmetreRentService districtRoomSqmetreRentService; + private RentDealPriceService rentDealPriceService; + private static final int EVALUATE_SHOW_DETAIL = 1; private static final Map PROPERTY_TYPES = new HashMap() { { @@ -4987,6 +4958,310 @@ public class PropertyController { return mav; } + /*** + * 小区租金估值报告 + * @param model + * @param request + * @return + * @throws NumberFormatException + * @throws IllegalAccessException + */ + public Object rentReportAction(PropertyEvaluationModel model, HttpServletRequest request)throws NumberFormatException, IllegalAccessException { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) + || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); + return mav; + } + if (model.getCity().endsWith("市")) { + model.setCity(model.getCity().replaceAll("市$", "")); + } + if (StringUtils.isNotBlank(request.getParameter("calDate"))) { + Date calDate = null; + try { + calDate = org.apache.commons.lang.time.DateUtils.parseDate(request.getParameter("calDate"), new String[] { "yyyy-MM-dd" }); + } catch (ParseException e) { + + } + if (calDate == null) { + mav.setModel(BasicModel.buildBadRequestModel("calDate:数据类型不合法")); + return mav; + } else { + model.setCalDate(calDate); + } + } + /* 先到CPDB库中查找小区 */ + District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), + "district"); + if (district == null) { + mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + return mav; + } + model.setName(district.getName()); + + + if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { + mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + return mav; + } + + if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { + mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + return mav; + } + if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { + mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + return mav; + } + + model.setRegion(district.getRegion()); + model.setDistrictName(district.getName()); + if (StringUtils.isBlank(model.getPropertyType())) { + if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + model.setPropertyType("1"); + } + } + + if (model.getCalDate() != null) { + if (new Date().before(model.getCalDate())) { + model.setCalDate(DateUtil.getFirstDayOfWeek(new Date())); + } else { + model.setCalDate(DateUtil.getFirstDayOfWeek(model.getCalDate())); + } + } else { + model.setCalDate(DateUtil.getFirstDayOfWeek(new Date())); + } + + Evaluation evaluation = buildEvaluation(model, request); + evaluation.setSource("api_property_evaluate_rent"); + evaluation = evaluationService.evaluateRent(district, evaluation, model.getCalDate()); + + + if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() != 0) { + evaluation.setAvgPrice((int)(evaluation.getTotalPrice()/evaluation.getArea())); + Map districtPriceMap = new HashMap(); + districtPriceMap.put("city", district.getCity()); + districtPriceMap.put("district", district.getRegion()); + districtPriceMap.put("name", district.getName()); + districtPriceMap.put("address", district.getAddress()); + districtPriceMap.put("totalPrice", evaluation.getTotalPrice()); + districtPriceMap.put("totalPriceUpper", CNNMFilter.convert(String.valueOf(evaluation.getTotalPrice()))); + districtPriceMap.put("cal_date", DateUtil.formatByPattern(new Date(), "yyyy/MM/dd")); + districtPriceMap.put("direction", evaluation.getDirection()); + districtPriceMap.put("size", evaluation.getArea()); + districtPriceMap.put("floor", model.getFloor()); + districtPriceMap.put("height", model.getHeight()); + districtPriceMap.put("fitment", evaluation.getFitment()); + + Integer startPrice = (int)(evaluation.getTotalPrice() - evaluation.getTotalPrice()*0.2); + Integer endPrice = (int)(evaluation.getTotalPrice() + evaluation.getTotalPrice()*0.2); + + //周边相似小区 + if (null == model.getRadius()) {// 设置默认值 + model.setRadius(1000); + } + String[] fields = { "city", "region", "name", "estateType2", "id","finishBuildingDate"}; + List allDistricts = districtService.findNearestDistrict(district, model.getRadius(), fields, Integer.MAX_VALUE); + //按条件过滤相似小区 + Integer buildYear = null; + List districts = null; + if(StringUtils.isNotBlank(district.getFinishBuildingDate())){ + buildYear = DistrictScoreUtil.parseStringToDate(district.getFinishBuildingDate()); + if(buildYear!=null){ + districts = new ArrayList(); + int startYear = buildYear -7; + int endYear = buildYear + 7; + for(District dist : allDistricts){ + if(StringUtils.isNotBlank(dist.getFinishBuildingDate())){ + int simlarDistYear = DistrictScoreUtil.parseStringToDate(district.getFinishBuildingDate()); + if(simlarDistYear>=startYear && simlarDistYear<=endYear && StringUtils.isNotBlank(district.getEstateType2()) && StringUtils.isNotBlank(dist.getEstateType2()) && district.getEstateType2().equals(dist.getEstateType2())){ + districts.add(dist); + } + } + } + } + } + + //相似房源 + Double startArea = model.getSize() - model.getSize()*0.1; + Double endArea = model.getSize() + model.getSize()*0.1; + Integer startDate = Integer.parseInt(org.apache.tools.ant.util.DateUtils.format(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd")); + List houses = seawaterService.findSeawatersFromEs2("rent", district.getCity(), district.getRegion(), district.getName(), null, null, startDate, null, + startArea, endArea, startPrice, endPrice, null, null, "p_date", false, 1, 5 , null,"seawater-20*/_doc"); + //无评估小区房源用周边相似小区的房源 + if(null == houses || houses.size()==0){ + for (District dist : districts) { + houses = seawaterService.findSeawatersFromEs2("rent", dist.getCity(), dist.getRegion(), dist.getName(), null, null, startDate, null, + startArea, endArea, startPrice, endPrice, null, null, "p_date", false, 1, 5 , null,"seawater-20*/_doc"); + if(houses!=null && houses.size()>0){ + break; + } + } + } + districtPriceMap.put("houses", houses); + + //周边相似小区租金 + Integer room = null; + if(model.getRoom()!=0){ + room = model.getRoom(); + }else{ + room = houseService.getDistrictRoomType((float)model.getSize()); + } + if (null != districts) { + if (null != room) { + List dtos = new ArrayList(); + Date weekend = DateUtil.getFirstDayOfWeek(new Date()); + for (District dist : districts) { + + List districtRoomSqmetreRents = districtRoomSqmetreRentService.findDistrictRoomSqmetreRents(dist, 1, room); + + ///List districtStatRents = districtStatRentService.findLatestDistrictStatRent(dist, 1, room); + if (null != districtRoomSqmetreRents && districtRoomSqmetreRents.size() > 0) { + DistrictRoomSqmetreRent districtRoomSqmetreRent = districtRoomSqmetreRents.get(0); + if (districtRoomSqmetreRent.getAvgPrice() > 0) { + + int startSqPrice = (int)(evaluation.getAvgPrice() - evaluation.getAvgPrice()*0.1); + int endSqPrice = (int)(evaluation.getAvgPrice() + evaluation.getAvgPrice()*0.1); +// SqmetreRent sqmetreRent = sqmetreRentService.findNearestSqmetreRent(dist.getCity(), dist.getRegion(), dist.getName(), DateUtil.formatToYYYYMMDD(weekend), "district"); + if(districtRoomSqmetreRent.getAvgPrice()>=startSqPrice && districtRoomSqmetreRent.getAvgPrice()<=endSqPrice){ + DistrictHouseDtao dto = new DistrictHouseDtao(); + dto.setCity(dist.getCity()); + dto.setRegion(dist.getRegion()); + dto.setDistrictName(dist.getName()); + dto.setSqAvgPrice(districtRoomSqmetreRent.getAvgPrice()); + dto.setRoom(room); + dtos.add(dto); + if(dtos.size()>=5){ + break; + } + } + } + } + } + districtPriceMap.put("districts", dtos); + } + } + + + //近一年户型租金走势 + Map trendsMap = districtRoomSqmetreRentService.getRentTrends(district.getCity(), district.getRegion(), district.getName(), room, -12); +// Map trendsMap = districtStatRentService.getRentTrend(district.getCity(), district.getRegion(), district.getDistrictName(), -12); + districtPriceMap.put("trends", trendsMap); + + + //成交的租房房源 + List rentTrades = rentDealPriceService.getRentDealPrices(district.getCity(), district.getRegion(), district.getName(), 5); + districtPriceMap.put("trades", rentTrades); + + mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); + return mav; + } else { + + mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的租金估价").markNoData()); + return mav; + } + } + + + + public Object evaluateRentAction(PropertyEvaluationModel model, HttpServletRequest request)throws NumberFormatException, IllegalAccessException { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) + || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); + return mav; + } + if (model.getCity().endsWith("市")) { + model.setCity(model.getCity().replaceAll("市$", "")); + } + if (StringUtils.isNotBlank(request.getParameter("calDate"))) { + Date calDate = null; + try { + calDate = org.apache.commons.lang.time.DateUtils.parseDate(request.getParameter("calDate"), new String[] { "yyyy-MM-dd" }); + } catch (ParseException e) { + + } + if (calDate == null) { + mav.setModel(BasicModel.buildBadRequestModel("calDate:数据类型不合法")); + return mav; + } else { + model.setCalDate(calDate); + } + } + /* 先到CPDB库中查找小区 */ + District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), + "district"); + if (district == null) { + mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); + return mav; + } + model.setName(district.getName()); + + + if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { + mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + return mav; + } + + if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { + mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + return mav; + } + if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { + mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + return mav; + } + + model.setRegion(district.getRegion()); + model.setDistrictName(district.getName()); + if (StringUtils.isBlank(model.getPropertyType())) { + if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + model.setPropertyType("1"); + } + } + + if (model.getCalDate() != null) { + if (new Date().before(model.getCalDate())) { + model.setCalDate(DateUtil.getFirstDayOfWeek(new Date())); + } else { + model.setCalDate(DateUtil.getFirstDayOfWeek(model.getCalDate())); + } + } else { + model.setCalDate(DateUtil.getFirstDayOfWeek(new Date())); + } + + Evaluation evaluation = buildEvaluation(model, request); + evaluation.setSource("api_property_evaluate_rent"); + evaluation = evaluationService.evaluateRent(district, evaluation, model.getCalDate()); + + + if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() != 0) { + Map districtPriceMap = new HashMap(); + districtPriceMap.put("city", district.getCity()); + districtPriceMap.put("district", district.getRegion()); + districtPriceMap.put("name", district.getName()); + districtPriceMap.put("address", district.getAddress()); + districtPriceMap.put("totalPrice", evaluation.getTotalPrice()); + districtPriceMap.put("cal_date", model.getCalDate()); + mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); + return mav; + } else { + + mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的租金估价").markNoData()); + return mav; + } + } + + + + + + + + + public void setHouseLoudongService(HouseLoudongService houseLoudongService) { this.houseLoudongService = houseLoudongService; } @@ -5159,4 +5434,20 @@ public class PropertyController { public void setRegionAnaDataService(RegionAnaDataService regionAnaDataService) { this.regionAnaDataService = regionAnaDataService; } + + public void setSeawaterService(SeawaterService seawaterService) { + this.seawaterService = seawaterService; + } + + public void setSqmetreRentService(SqmetreRentService sqmetreRentService) { + this.sqmetreRentService = sqmetreRentService; + } + + public void setDistrictRoomSqmetreRentService(DistrictRoomSqmetreRentService districtRoomSqmetreRentService) { + this.districtRoomSqmetreRentService = districtRoomSqmetreRentService; + } + + public void setRentDealPriceService(RentDealPriceService rentDealPriceService) { + this.rentDealPriceService = rentDealPriceService; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RentController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RentController.java index 64d6ee9df..d745b80dc 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RentController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/RentController.java @@ -1,5 +1,6 @@ package com.fangjia.open.controllers; +import java.text.ParseException; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -7,6 +8,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.fangjia.dal.mongo.model.*; +import com.fangjia.dal.mongo.open.model.ApiUserAuthority; +import com.fangjia.dal.seawater.model.Seawater; +import com.fangjia.open.dto.DistrictDto; +import com.fangjia.open.dto.DistrictHouseDtao; +import com.fangjia.open.model.PropertyEvaluationModel; +import com.fangjia.open.util.CommonUtils; +import com.fangjia.service.datastore.EvaluationService; +import com.fangjia.service.datastore.HouseService; +import com.fangjia.service.mongo.fangjia.SeawaterService; import org.apache.commons.lang.StringUtils; import org.apache.tools.ant.util.DateUtils; @@ -15,9 +26,6 @@ import com.fangjia.core.util.DateUtil; import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.common.ServerAreaData; import com.fangjia.dal.mongo.fangjia.model.ServerArea; -import com.fangjia.dal.mongo.model.DistrictStatRent; -import com.fangjia.dal.mongo.model.RegionStatRent; -import com.fangjia.dal.mongo.model.SqmetreRent; import com.fangjia.dal.seaweed.model.District; import com.fangjia.open.HttpCode; import com.fangjia.open.OpenHttpCodeEnum; @@ -35,6 +43,8 @@ import com.fangjia.service.district.DistrictStatService; import com.fangjia.service.district.RegionStatRentService; import com.fangjia.service.district.SqmetreRentService; +import javax.servlet.http.HttpServletRequest; + //@Authority(role = Role.USER) public class RentController { @@ -43,6 +53,9 @@ public class RentController { private DistrictStatRentService districtStatRentService; private DistrictStatService districtStatService; private RegionStatRentService regionStatRentService; + private EvaluationService evaluationService; + private SeawaterService seawaterService; + private HouseService houseService; //城市平米租金 public Object cityRentAction(RentModel rentModel){ RestfulModelAndView mav = new RestfulModelAndView(); @@ -298,49 +311,93 @@ public class RentController { }else if(rentModel.getType() == 4){ //两年 type = -24; } - List dates = DateUtil.getLastDayBetweenDates(DateUtil.addMonthToDate(new Date(),type), new Date()); - - List times = new ArrayList(); - for(Date date : dates){ - times.add(DateUtils.format(date, "yyyy-MM")); - } - - List districtRents = districtStatRentService.findDistrictStatRentsByParams(rentModel.getCity(), rentModel.getDistrict(), rentModel.getName(), null, dates.get(0), dates.get(dates.size()-1), null, null, null, null, true); - Map> distMap = null; - List rooms = null; - - if(null != districtRents){ - distMap = new HashMap>(); - rooms = new ArrayList(); - for(DistrictStatRentBo rent : districtRents){ - - DistrictStatRent distRent = rent.getDistrictStatRent(); - if(null == distRent){ - distRent = rent.getVillaDistrictStatRent(); - } - - Map priceMap = distMap.get(distRent.getHouseType().toString()); - if(null == priceMap){ - rooms.add(distRent.getHouseType()); - priceMap = new HashMap(); - distMap.put(distRent.getHouseType().toString(), priceMap); - } - - priceMap.put(DateUtils.format(distRent.getEndMonthDate(), "yyyy-MM"), distRent.getAvgPrice()); - } - } - - Collections.sort(rooms); - - Map retMap = new HashMap(); - retMap.put("times", times); - retMap.put("distMap", distMap); - retMap.put("rooms", rooms); - mav.setModel(BasicModel.buildOKModel().setResult(retMap)); + Map trendsMap = districtStatRentService.getRentTrend(rentModel.getCity(), rentModel.getDistrict(), rentModel.getName(), type); + mav.setModel(BasicModel.buildOKModel().setResult(trendsMap)); return mav; } - - + +// public Object evaluateRentAction(RentModel model, HttpServletRequest request){ +// RestfulModelAndView mav = new RestfulModelAndView(); +// +// if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) +// || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { +// mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); +// return mav; +// } +// +// District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); +// if (null == district) { +// mav.setModel(BasicModel.buildBadRequestModel("小区不存在")); +// return mav; +// } +// +// Double startArea = model.getSize() - model.getSize()*0.1; +// Double endArea = model.getSize() + model.getSize()*0.1; +// +// Integer startDate = Integer.parseInt(DateUtils.format(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd")); +// +// //相似房源 +// List houses = seawaterService.findSeawatersFromEs2("rent", district.getCity(), district.getRegion(), district.getName(), null, null, startDate, null, +// startArea, endArea, null, null, null, null, "p_date", false, 1, 5 , null,"seawater-20*/_doc"); +// Map retMap = new HashMap(); +// retMap.put("houses", houses); +// +// if (null == model.getRadius()) {// 设置默认值 +// model.setRadius(2000); +// } +// +// //相近小区 +// List districts = districtService.findNearestDistrict(district, model.getRadius(), 50); +// if (null != districts) { +// Integer room = null; +// if(model.getHouseType()!=null){ +// room = model.getHouseType(); +// }else{ +// room = houseService.getDistrictRoomType(model.getSize()); +// } +// +// if (null != room) { +// List dtos = new ArrayList(); +// List prices = new ArrayList(); +// Date weekend = DateUtil.getFirstDayOfWeek(new Date()); +// for (District dist : districts) { +// List districtStatRents = districtStatRentService.findLatestDistrictStatRent(dist, 1, room); +// if (null != districtStatRents && districtStatRents.size() > 0) { +// DistrictStatRent districtStatRent = districtStatRents.get(0); +// if (districtStatRent.getAvgPrice() > 0) { +// SqmetreRent sqmetreRent = sqmetreRentService.findNearestSqmetreRent(dist.getCity(), dist.getRegion(), dist.getName(), DateUtil.formatToYYYYMMDD(weekend), "district"); +// if(sqmetreRent != null){ +// DistrictHouseDtao dto = new DistrictHouseDtao(); +// dto.setCity(dist.getCity()); +// dto.setRegion(dist.getRegion()); +// dto.setDistrictName(dist.getName()); +// dto.setSqAvgPrice(sqmetreRent.getAvgPrice()); +// dto.setRoom(room); +// dtos.add(dto); +// if(dtos.size()>=5){ +// break; +// } +// } +// } +// } +// } +// retMap.put("districts", dtos); +// } +// } +// +// +// Map trendsMap = districtStatRentService.getRentTrend(model.getCity(), model.getDistrict(), model.getName(), -12); +// retMap.put("trends", trendsMap); +// mav.setModel(BasicModel.buildOKModel().setResult(retMap)); +// return mav; +// } + + + + public void setSeawaterService(SeawaterService seawaterService) { + this.seawaterService = seawaterService; + } + public void setSqmetreRentService(SqmetreRentService sqmetreRentService) { this.sqmetreRentService = sqmetreRentService; } @@ -359,4 +416,11 @@ public class RentController { this.regionStatRentService = regionStatRentService; } + public void setEvaluationService(EvaluationService evaluationService) { + this.evaluationService = evaluationService; + } + + public void setHouseService(HouseService houseService) { + this.houseService = houseService; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java new file mode 100644 index 000000000..9ae5bbeb4 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java @@ -0,0 +1,584 @@ +package com.fangjia.open.controllers.weixin; + +import com.fangjia.core.util.*; +import com.fangjia.dal.QueryParam; +import com.fangjia.dal.SdQuery; +import com.fangjia.dal.SrQuery; +import com.fangjia.dal.mongo.model.DistrictRoomSqmetreRent; +import com.fangjia.dal.mongo.model.Evaluation; +import com.fangjia.dal.mongo.model.RentDealPrice; +import com.fangjia.dal.seawater.model.Seawater; +import com.fangjia.dal.seaweed.model.District; +import com.fangjia.open.compatible.model.JsonModel; +import com.fangjia.open.dto.DistrictHouseDtao; +import com.fangjia.open.interceptors.AuthenticationBean; +import com.fangjia.open.model.BaseModel; +import com.fangjia.open.model.weixin.EvaluationModel; +import com.fangjia.open.model.weixin.PropertyEvaluationModel; +import com.fangjia.open.util.LineChartsUtils; +import com.fangjia.service.api.AutoCompleteBo; +import com.fangjia.service.datastore.DistrictService; +import com.fangjia.service.datastore.EvaluationService; +import com.fangjia.service.datastore.HouseService; +import com.fangjia.service.district.DistrictRoomSqmetreRentService; +import com.fangjia.service.district.RentDealPriceService; +import com.fangjia.service.mongo.fangjia.FileService; +import com.fangjia.service.mongo.fangjia.SeawaterService; +import com.fangjia.service.util.DistrictScoreUtil; +import com.lowagie.text.pdf.BaseFont; +import org.apache.commons.lang.StringUtils; +import org.apache.lucene.index.Term; +import org.apache.lucene.search.BooleanClause; +import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.TermQuery; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.sothis.core.util.CollectionUtils; +import org.sothis.web.mvc.ActionContext; +import org.sothis.web.mvc.annotation.Param; +import org.xhtmlrenderer.pdf.ITextFontResolver; +import org.xhtmlrenderer.pdf.ITextRenderer; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; +import java.text.ParseException; +import java.util.*; + +/** + * 建设银行租金控制类 + * + * @author shenjian + * @since 2021/4/6 + */ +public class CcbRentController { + + private static final Logger logger = LoggerFactory.getLogger(CcbRentController.class); + + private DistrictService districtService; + private SeawaterService seawaterService; + private DistrictRoomSqmetreRentService districtRoomSqmetreRentService; + private EvaluationService evaluationService; + private HouseService houseService; + private RentDealPriceService rentDealPriceService; + private FileService fileService; + + public Object indexAction(BaseModel result) { + return result; + } + + public Object reportAction(EvaluationModel result, @Param(name = "address") String address, @Param(name = "totalPrice") String totalPrice) { + result.setLender(address); + if (StringUtils.isNotBlank(totalPrice)) { + result.setDealPrice(Double.valueOf(totalPrice)); + } + return result; + } + + public Object detailAction(PropertyEvaluationModel result) { + return result; + } + + public Object downloadPageAction(PropertyEvaluationModel result, HttpServletRequest request, @Param(name = "city") String city, @Param(name = "district") String districtStr, + @Param(name = "name") String name, @Param(name = "address") String address, + @Param(name = "size") Double size, @Param(name = "floor") Integer floor, @Param(name = "height") Integer height, @Param(name = "room") Integer room, + @Param(name = "hall") Integer hall, @Param(name = "toilet") Integer toilet, @Param(name = "direction") String direction, @Param(name = "fitment") String fitment) { + com.fangjia.open.model.PropertyEvaluationModel model = new com.fangjia.open.model.PropertyEvaluationModel(); + model.setCity(city); + model.setDistrict(districtStr); + model.setName(name); + model.setAddress(address); + model.setSize(size); + model.setFloor(floor); + model.setHeight(height); + if (room != null) { + model.setRoom(room); + } + if (hall != null) { + model.setHall(hall); + } + if (toilet != null) { + model.setToilet(toilet); + } + model.setDirection(direction); + model.setFitment(fitment); + + if (model.getCity().endsWith("市")) { + model.setCity(model.getCity().replaceAll("市$", "")); + } + if (StringUtils.isNotBlank(request.getParameter("calDate"))) { + Date calDate = null; + try { + calDate = org.apache.commons.lang.time.DateUtils.parseDate(request.getParameter("calDate"), new String[] { "yyyy-MM-dd" }); + } catch (ParseException e) { + + } + model.setCalDate(calDate); + } + /* 先到CPDB库中查找小区 */ + District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), + "district"); + model.setName(district.getName()); + + + model.setRegion(district.getRegion()); + model.setDistrictName(district.getName()); + if (StringUtils.isBlank(model.getPropertyType())) { + if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + model.setPropertyType("1"); + } + } + + if (model.getCalDate() != null) { + if (new Date().before(model.getCalDate())) { + model.setCalDate(DateUtil.getFirstDayOfWeek(new Date())); + } else { + model.setCalDate(DateUtil.getFirstDayOfWeek(model.getCalDate())); + } + } else { + model.setCalDate(DateUtil.getFirstDayOfWeek(new Date())); + } + + Evaluation evaluation = buildEvaluation(model, request); + evaluation.setSource("api_property_evaluate_rent"); + evaluation = evaluationService.evaluateRent(district, evaluation, model.getCalDate()); + + if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() != 0) { + evaluation.setAvgPrice((int)(evaluation.getTotalPrice()/evaluation.getArea())); + Map districtPriceMap = new HashMap(); + districtPriceMap.put("city", district.getCity()); + districtPriceMap.put("district", district.getRegion()); + districtPriceMap.put("name", district.getName()); + districtPriceMap.put("address", district.getAddress()); + districtPriceMap.put("totalPrice", evaluation.getTotalPrice()); + districtPriceMap.put("totalPriceUpper", CNNMFilter.convert(String.valueOf(evaluation.getTotalPrice()))); + districtPriceMap.put("cal_date", DateUtil.formatByPattern(new Date(), "yyyy/MM/dd")); + districtPriceMap.put("direction", evaluation.getDirection()); + districtPriceMap.put("size", evaluation.getArea()); + districtPriceMap.put("floor", model.getFloor()); + districtPriceMap.put("height", model.getHeight()); + districtPriceMap.put("fitment", evaluation.getFitment()); + + Integer startPrice = (int)(evaluation.getTotalPrice() - evaluation.getTotalPrice()*0.2); + Integer endPrice = (int)(evaluation.getTotalPrice() + evaluation.getTotalPrice()*0.2); + + //周边相似小区 + if (null == model.getRadius()) {// 设置默认值 + model.setRadius(1000); + } + String[] fields = { "city", "region", "name", "estateType2", "id","finishBuildingDate"}; + List allDistricts = districtService.findNearestDistrict(district, model.getRadius(), fields, Integer.MAX_VALUE); + //按条件过滤相似小区 + Integer buildYear = null; + List districts = null; + if(StringUtils.isNotBlank(district.getFinishBuildingDate())){ + buildYear = DistrictScoreUtil.parseStringToDate(district.getFinishBuildingDate()); + if(buildYear!=null){ + districts = new ArrayList(); + int startYear = buildYear -7; + int endYear = buildYear + 7; + for(District dist : allDistricts){ + if(StringUtils.isNotBlank(dist.getFinishBuildingDate())){ + int simlarDistYear = DistrictScoreUtil.parseStringToDate(district.getFinishBuildingDate()); + if(simlarDistYear>=startYear && simlarDistYear<=endYear && StringUtils.isNotBlank(district.getEstateType2()) && StringUtils.isNotBlank(dist.getEstateType2()) && district.getEstateType2().equals(dist.getEstateType2())){ + districts.add(dist); + } + } + } + } + } + + //相似房源 + Double startArea = model.getSize() - model.getSize()*0.1; + Double endArea = model.getSize() + model.getSize()*0.1; + Integer startDate = Integer.parseInt(org.apache.tools.ant.util.DateUtils.format(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd")); + List houses = seawaterService.findSeawatersFromEs2("rent", district.getCity(), district.getRegion(), district.getName(), null, null, startDate, null, + startArea, endArea, startPrice, endPrice, null, null, "p_date", false, 1, 5 , null,"seawater-20*/_doc"); + //无评估小区房源用周边相似小区的房源 + if(null == houses || houses.size()==0){ + for (District dist : districts) { + houses = seawaterService.findSeawatersFromEs2("rent", dist.getCity(), dist.getRegion(), dist.getName(), null, null, startDate, null, + startArea, endArea, startPrice, endPrice, null, null, "p_date", false, 1, 5 , null,"seawater-20*/_doc"); + if(houses!=null && houses.size()>0){ + break; + } + } + } + if (CollectionUtils.isNotEmpty(houses)) { + for (Seawater seawater: houses) { + if (seawater.getpDate() != null) { + seawater.setRoot(DateUtil.formatByPattern(DateUtil.parseDate(String.valueOf(seawater.getpDate()), "yyyyMMdd"), "yyyy-MM-dd")); + } + } + } + districtPriceMap.put("houses", houses); + + //周边相似小区租金 + if(model.getRoom() != 0){ + room = model.getRoom(); + }else{ + room = houseService.getDistrictRoomType((float)model.getSize()); + } + if (null != districts) { + if (null != room) { + List dtos = new ArrayList(); + Date weekend = DateUtil.getFirstDayOfWeek(new Date()); + for (District dist : districts) { + + List districtRoomSqmetreRents = districtRoomSqmetreRentService.findDistrictRoomSqmetreRents(dist, 1, room); + + ///List districtStatRents = districtStatRentService.findLatestDistrictStatRent(dist, 1, room); + if (null != districtRoomSqmetreRents && districtRoomSqmetreRents.size() > 0) { + DistrictRoomSqmetreRent districtRoomSqmetreRent = districtRoomSqmetreRents.get(0); + if (districtRoomSqmetreRent.getAvgPrice() > 0) { + + int startSqPrice = (int)(evaluation.getAvgPrice() - evaluation.getAvgPrice()*0.1); + int endSqPrice = (int)(evaluation.getAvgPrice() + evaluation.getAvgPrice()*0.1); +// SqmetreRent sqmetreRent = sqmetreRentService.findNearestSqmetreRent(dist.getCity(), dist.getRegion(), dist.getName(), DateUtil.formatToYYYYMMDD(weekend), "district"); + if(districtRoomSqmetreRent.getAvgPrice()>=startSqPrice && districtRoomSqmetreRent.getAvgPrice()<=endSqPrice){ + DistrictHouseDtao dto = new DistrictHouseDtao(); + dto.setCity(dist.getCity()); + dto.setRegion(dist.getRegion()); + dto.setDistrictName(dist.getName()); + dto.setSqAvgPrice(districtRoomSqmetreRent.getAvgPrice()); + dto.setRoom(room); + dtos.add(dto); + if(dtos.size()>=5){ + break; + } + } + } + } + } + districtPriceMap.put("districts", dtos); + } + } + + //近一年户型租金走势 + Map trendsMap = districtRoomSqmetreRentService.getRentTrends(district.getCity(), district.getRegion(), district.getName(), room, -12); + districtPriceMap.put("trends", trendsMap); + + // 生成走势图图片,一遍转pdf + String tradesImgUrl = buildTrendImage(trendsMap, room); + + //成交的租房房源 + List rentTrades = rentDealPriceService.getRentDealPrices(district.getCity(), district.getRegion(), district.getName(), 5); + if (CollectionUtils.isNotEmpty(rentTrades)) { + for (RentDealPrice price : rentTrades) { + // 返回成交日期到前端,直接取日期转pdf报错!!!!!!!!!!!!!!!!! + if (price.getTradeDate() != null) { + price.setSource(DateUtil.formatByPattern(price.getTradeDate(), "yyyy-MM-dd")); + } + } + } + districtPriceMap.put("trades", rentTrades); + districtPriceMap.put("tradesImgUrl", tradesImgUrl); + + result.setResult(districtPriceMap); + } + return result; + } + + private String buildTrendImage(Map trendsMap, Integer room) { + List times = (List) trendsMap.get("times"); + Map distMap = (Map) ((Map) trendsMap.get("distMap")).get(String.valueOf(room)); + if (distMap != null) { + List values = new ArrayList(); + for (int i = 0; i < times.size(); i++) { + if (distMap.get(times.get(i)) != null) { + values.add((Integer) distMap.get(times.get(i))); + } else { + values.add(null); + } + } + // 保存到本地测试 + //String url = LineChartsUtils.createChartAndSave2Png("d://test.png",room + "居室", times, values); + String url = LineChartsUtils.createChartAndUpload(fileService,room + "居室", times, values); + logger.info("租金估值图片上传至服务器:{}", url); + return url; + } + return null; + } + + /** + * 通过EvaluationModel组装Evaluation实体 + * + * @param model + * @param request + * @return + */ + private Evaluation buildEvaluation(com.fangjia.open.model.PropertyEvaluationModel model, HttpServletRequest request) { + Evaluation evaluation = new Evaluation(); + evaluation.setCity(model.getCity()); + evaluation.setRegion(model.getRegion()); + evaluation.setDistrictName(model.getName()); + evaluation.setDirection(DIRECTION.get(model.getDirection())); + evaluation.setFitment(EVALUATION_MODEL_FITMENT.get(FITMENT.get(model.getDecoration()))); + evaluation.setAtticArea(model.getAtticSize()); + evaluation.setTerraceArea(model.getOuterSize()); + evaluation.setBasementArea(model.getBasementSize()); + evaluation.setGardenArea(model.getGardenSize()); + String worryFacility = model.getNegativeFactor(); + evaluation.setCreationDate(new Date()); + evaluation.setModificationDate(new Date()); + evaluation.setClientNo(model.getClientNo()); + if (0 != model.getAge()) { + evaluation.setAge(model.getAge()); + } + evaluation.setArea(model.getSize()); + if (StringUtils.isNotBlank(model.getBuildType())) { + evaluation.setBuildType(model.getBuildType()); + } + if (StringUtils.isNotBlank(model.getCarport())) { + evaluation.setCarport(model.getCarport()); + } + if (model.getDecorationAge() >= 1 && model.getDecorationAge() <= 5) { + evaluation.setFitmentAge(model.getDecorationAge()); + } + evaluation.setCarportPrice(model.getCarportPrice()); + evaluation.setCity(model.getCity()); + evaluation.setDistrictName(model.getName()); + if (model.getDecorationCost() != null && model.getDecorationCost() > 0) { + evaluation.setFitmentCharge(model.getDecorationCost()); + } + if (0 != model.getHall()) { + evaluation.setHall(model.getHall()); + } + if (null != model.getFloor()) { + evaluation.setFloor(model.getFloor()); + } + if (model.getMaxFloor() != null && 0 != model.getMaxFloor()) { + evaluation.setHeight(model.getMaxFloor()); + } + if (StringUtils.isNotBlank(model.getBuildingNumber())) { + evaluation.setHouseNum(model.getBuildingNumber()); + } + if (StringUtils.isNotBlank(model.getHouseProperty())) { + evaluation.setHouseProperty(model.getHouseProperty()); + } + if (StringUtils.isNotBlank(model.getInsidepos())) { + evaluation.setInsidepos(model.getInsidepos()); + } + if (StringUtils.isNotBlank(model.getLightingVentilation())) { + evaluation.setLightingVentilation(model.getLightingVentilation()); + } + + if (StringUtils.isNotBlank(model.getOtherFactor())) { + evaluation.setOtherFactor(model.getOtherFactor()); + } + evaluation.setRegion(model.getDistrict()); + if (0 != model.getRoom()) { + evaluation.setRoom(model.getRoom()); + } + if (StringUtils.isNotBlank(model.getRoomNumber())) { + evaluation.setRoomNum(model.getRoomNumber()); + } + if (StringUtils.isNotBlank(model.getSideset())) { + evaluation.setSideset(model.getSideset()); + } + if (0 != model.getToilet()) { + evaluation.setToilet(model.getToilet()); + } + + if (StringUtils.isNotBlank(model.getFacade())) { + evaluation.setFacade(model.getFacade()); + } + if (StringUtils.isNotBlank(model.getTraffice())) { + evaluation.setTraffice(model.getTraffice()); + } + if (StringUtils.isNotBlank(model.getShape())) { + evaluation.setShape(model.getShape()); + } + if (StringUtils.isNotBlank(model.getObstacle())) { + evaluation.setObstacle(model.getObstacle()); + } + if (StringUtils.isNotBlank(model.getIndustry())) { + evaluation.setIndustry(model.getIndustry()); + } + if (StringUtils.isNotBlank(model.getSupportDevice())) { + evaluation.setSupportDevice(model.getSupportDevice()); + } + if (StringUtils.isNotBlank(model.getLeftPosition())) { + evaluation.setLeftPosition(model.getLeftPosition()); + } + if (StringUtils.isNotBlank(model.getShopType())) { + evaluation.setShopType(model.getShopType()); + } + if (StringUtils.isNotBlank(model.getShopUnique())) { + evaluation.setShopUnique(model.getShopUnique()); + } + if (StringUtils.isNotBlank(model.getLocation())) { + evaluation.setLocation(model.getLocation()); + } + if (model.isNewDistrict()) { + evaluation.setNewDistrict(model.isNewDistrict()); + } + String ip = AnalyticsUtil.getIpAddress(ActionContext.getContext().getRequest()); + evaluation.setIp(ip); + AuthenticationBean authenticationBean = (AuthenticationBean) request + .getAttribute(AuthenticationBean.ATTR_AUTHENTICATION_BEAN); + if (authenticationBean != null && authenticationBean.apiUser != null) { + evaluation.setFromUserId(String.valueOf(authenticationBean.apiUser.getId())); + } + evaluation.setSource("api_property_evaluation"); + return evaluation; + } + + public void downloadAction(HttpServletResponse response, HttpServletRequest request, @Param(name = "city") String city, @Param(name = "district") String district, + @Param(name = "name") String name, @Param(name = "address") String address, + @Param(name = "size") Double size, @Param(name = "floor") Integer floor, @Param(name = "height") Integer height, @Param(name = "room") Integer room, + @Param(name = "hall") Integer hall, @Param(name = "toilet") Integer toilet, @Param(name = "direction") String direction, @Param(name = "fitment") String fitment) throws IOException { + response.setHeader("Content-disposition", "attachment; filename=report.pdf"); + response.setContentType("application/pdf;charset=UTF-8"); + response.setCharacterEncoding("UTF-8"); + OutputStream os = null; + try { + os = response.getOutputStream(); + ITextRenderer renderer = new ITextRenderer(35, 20); + ITextFontResolver fontResolver = renderer.getFontResolver(); + String fontUrl = ActionContext.getContext().getServletContext().getRealPath("/") + "fonts" + File.separator + "simsun.ttc"; + fontResolver.addFont(fontUrl, BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED); + final String path = "http://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath(); + String url = path + "/ccbRent/downloadPage?city=" + DataUtil.urlEncode(city) + "&district="+DataUtil.urlEncode(district)+"&name="+DataUtil.urlEncode(name); + url += "&address=" + DataUtil.urlEncode(address) +"&size="+size+"&floor="+floor+"&height="+height+"&room="+room+"&hall="+hall+"&toilet="+toilet+"&direction="+direction+"&fitment="+fitment; + renderer.setDocument(url); + renderer.layout(); + renderer.createPDF(os, true); + renderer.finishPDF(); + os.flush(); + os.close(); + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (os != null) { + os.close(); + } + } + } + + /** + * 方法同DistrictController#suggestAction + */ + public Object suggestAction(@Param(name = "city") String city, @Param(name = "cat") String cat, @Param(name = "keyword") String keyword, + @Param(name = "limit") Integer limit, @Param(name="lat")Double lat, @Param(name="lng")Double lng) { + JsonModel model = new JsonModel(); + if (limit == null || limit > 100 || limit <= 0) { + limit = 10; + } + System.out.println(cat + "#" + city + "#" + keyword + "#" + limit + "#" + lng + "#" + lat); + List suggestList = getDistrictByKeyword(cat, city, keyword, limit, lng, lat); + model.setJsonModel(suggestList); + return model; + } + + private List getDistrictByKeyword(String cat, String city, String keyword, int limit, final Double lng, final Double lat) { + + keyword = DataUtil.escapeSolr(keyword); + if (StringUtils.isBlank(keyword) || keyword.length() >= 30) { + return null; + } + + List params = new ArrayList(); + params.add(new QueryParam("city", city)); + params.add(new QueryParam("category", cat)); + params.add(new QueryParam("visible", 0)); + + + BooleanQuery srQuery1 = new BooleanQuery(); + BooleanQuery nameQuery = new BooleanQuery(); + // nameQuery.add(new TermQuery(new Term("district_name", keyword)), BooleanClause.Occur.SHOULD); + // nameQuery.add(new TermQuery(new Term("alias_std", keyword)), BooleanClause.Occur.SHOULD); + // nameQuery.add(new TermQuery(new Term("address", keyword)), BooleanClause.Occur.SHOULD); + // nameQuery.add(new TermQuery(new Term("addr_alias_std", keyword)), BooleanClause.Occur.SHOULD); + nameQuery.add(new TermQuery(new Term("keyword", keyword)), BooleanClause.Occur.SHOULD); + //nameQuery.add(new TermQuery(new Term("keyword_cjk", keyword)), BooleanClause.Occur.SHOULD);//这个重要,因seaweed不支持模糊搜索,当输入"中远两"需用此进行搜索 + srQuery1.add(nameQuery, BooleanClause.Occur.SHOULD); + if(lat != null && lng != null && lat != 0 && lng != 0){ + Map geo = GeocodeUtils.geoconvBaiduToGoogle(lng, lat); + SdQuery sdQuery = new SdQuery(); + sdQuery.setPoint(geo.get("lat") + "," + geo.get("lng")); + sdQuery.setField("lat_lng"); + sdQuery.setDistance("500"); + params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery)); + } + params.add(new QueryParam("$sr", new SrQuery(srQuery1))); + List districts = districtService.findAllByParams(params, 0, limit, new String[]{"region", "name", "address", "addrAlias","id"}); + List ret = new ArrayList(districts.size()); + for (District district : districts) { + AutoCompleteBo bo = new AutoCompleteBo(); + bo.setKeyword(district.getName()); + bo.setVal(district.getName()); + bo.setDesc(district.getAddress()); + bo.setRegion(district.getRegion()); + bo.setId(district.getId()); + ret.add(bo); + } + return ret; + } + + private static final Map DIRECTION = new HashMap() { + { + put(null, "南"); + put("1", "西南"); + put("2", "东南"); + put("3", "南"); + put("4", "西北"); + put("5", "东北"); + put("6", "东"); + put("7", "西"); + put("8", "北"); + put("9", "东西"); + put("10", "南北"); + } + }; + + private static final Map FITMENT = new HashMap() { + { + put(null, "简装"); + put("1", "毛坯"); + put("2", "简装"); + put("3", "精装"); + put("4", "豪装"); + } + }; + + private static final Map EVALUATION_MODEL_FITMENT = new HashMap() { + { + put(null, "简单装修"); + put("简装", "简单装修"); + put("毛坯", "毛坯"); + put("精装", "精装修"); + put("豪装", "豪华装修"); + } + }; + + public void setDistrictService(DistrictService districtService) { + this.districtService = districtService; + } + + public void setSeawaterService(SeawaterService seawaterService) { + this.seawaterService = seawaterService; + } + + public void setDistrictRoomSqmetreRentService(DistrictRoomSqmetreRentService districtRoomSqmetreRentService) { + this.districtRoomSqmetreRentService = districtRoomSqmetreRentService; + } + + public void setEvaluationService(EvaluationService evaluationService) { + this.evaluationService = evaluationService; + } + + public void setHouseService(HouseService houseService) { + this.houseService = houseService; + } + + public void setRentDealPriceService(RentDealPriceService rentDealPriceService) { + this.rentDealPriceService = rentDealPriceService; + } + + public void setFileService(FileService fileService) { + this.fileService = fileService; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CcbRentDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CcbRentDto.java new file mode 100644 index 000000000..55ff07adc --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/CcbRentDto.java @@ -0,0 +1,145 @@ +package com.fangjia.open.dto; + +import groovy.transform.builder.Builder; + +import java.io.Serializable; + +/** + * 建行租金dto + * + * @author shenjian + * @since 2021/4/6 + */ +@Builder +public class CcbRentDto implements Serializable { + + private String city; + // 区域 + private String district; + // 小区名 + private String name; + // 面积 + private Double size; + // 半径 + private Integer radius; + // 室 + private Integer room; + // 厅 + private Integer hall; + // 卫 + private Integer toilet; + // 所在楼层 + private Integer floor; + // 总楼层 + private Integer height; + // 朝向 + private String direction; + // 装修情况 + private String fitment; + // 电梯配套 + private Boolean hasLift; + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getRadius() { + return radius; + } + + public void setRadius(Integer radius) { + this.radius = radius; + } + + public Integer getRoom() { + return room; + } + + public void setRoom(Integer room) { + this.room = room; + } + + public Integer getHall() { + return hall; + } + + public void setHall(Integer hall) { + this.hall = hall; + } + + public Integer getToilet() { + return toilet; + } + + public void setToilet(Integer toilet) { + this.toilet = toilet; + } + + public Integer getFloor() { + return floor; + } + + public void setFloor(Integer floor) { + this.floor = floor; + } + + public String getDirection() { + return direction; + } + + public void setDirection(String direction) { + this.direction = direction; + } + + public String getFitment() { + return fitment; + } + + public void setFitment(String fitment) { + this.fitment = fitment; + } + + public Boolean getHasLift() { + return hasLift; + } + + public void setHasLift(Boolean hasLift) { + this.hasLift = hasLift; + } + + public Double getSize() { + return size; + } + + public void setSize(Double size) { + this.size = size; + } + + public Integer getHeight() { + return height; + } + + public void setHeight(Integer height) { + this.height = height; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictDto.java index 367730d36..0e3268bf1 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictDto.java @@ -48,7 +48,8 @@ public class DistrictDto implements Serializable { * 均价 */ private Integer avgPrice; - + + /** * 板块 */ @@ -525,7 +526,5 @@ public class DistrictDto implements Serializable { public void setAvgPrice(Integer avgPrice) { this.avgPrice = avgPrice; } - - } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictHouseDtao.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictHouseDtao.java new file mode 100644 index 000000000..56fa36f55 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictHouseDtao.java @@ -0,0 +1,79 @@ +package com.fangjia.open.dto; + +import java.io.Serializable; + +public class DistrictHouseDtao implements Serializable { + + private String city; + private String region; + private String districtName; + private Integer roomPrice; + private Integer sqAvgPrice; + private Integer room; + private Integer hall; + private Integer toilet; + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getDistrictName() { + return districtName; + } + + public void setDistrictName(String districtName) { + this.districtName = districtName; + } + + public Integer getRoomPrice() { + return roomPrice; + } + + public void setRoomPrice(Integer roomPrice) { + this.roomPrice = roomPrice; + } + + public Integer getSqAvgPrice() { + return sqAvgPrice; + } + + public void setSqAvgPrice(Integer sqAvgPrice) { + this.sqAvgPrice = sqAvgPrice; + } + + public Integer getRoom() { + return room; + } + + public void setRoom(Integer room) { + this.room = room; + } + + public Integer getHall() { + return hall; + } + + public void setHall(Integer hall) { + this.hall = hall; + } + + public Integer getToilet() { + return toilet; + } + + public void setToilet(Integer toilet) { + this.toilet = toilet; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java index 14cfa1bb3..61f0618f7 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java @@ -1,5 +1,7 @@ package com.fangjia.open.model; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; import java.util.Date; public class PropertyEvaluationModel extends FangjiaApiModel { @@ -267,7 +269,9 @@ public class PropertyEvaluationModel extends FangjiaApiModel { private String estateType; private String periodType; private Integer periodCount; - private int houseType; + + + private Integer houseType; private String clientNo; private int scope; @@ -280,6 +284,7 @@ public class PropertyEvaluationModel extends FangjiaApiModel { private String user; + public void setDecorationAge(int decorationAge) { this.decorationAge = decorationAge; } @@ -701,11 +706,11 @@ public class PropertyEvaluationModel extends FangjiaApiModel { this.decoration = decoration; } - public int getHouseType() { + public Integer getHouseType() { return houseType; } - public void setHouseType(int houseType) { + public void setHouseType(Integer houseType) { this.houseType = houseType; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/RentModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/RentModel.java index fe3afe2a2..b2d48f791 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/RentModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/RentModel.java @@ -30,10 +30,15 @@ public class RentModel { private String endDate; + @Min(1) @Max(4) private Integer type;//类型 + @Min(1) + @Max(6) + private Integer houseType;//房型 + public String getCity() { return city; } @@ -90,9 +95,12 @@ public class RentModel { this.type = type; } - - - - - + + public Integer getHouseType() { + return houseType; + } + + public void setHouseType(Integer houseType) { + this.houseType = houseType; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java index 9dfcc82a7..dcdb3e2c2 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java @@ -39,7 +39,6 @@ public class EvaluationModel extends BaseModel{ private Integer role; private String cardId; - public void setId(String id) { this.id = id; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/PropertyEvaluationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/PropertyEvaluationModel.java new file mode 100644 index 000000000..18068d19c --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/PropertyEvaluationModel.java @@ -0,0 +1,181 @@ +package com.fangjia.open.model.weixin; + +import com.fangjia.open.model.BaseModel; + +import java.util.Map; + +/** + * 建行租房估值 + * + * @author shenjian + * @since 2021/4/7 + */ +public class PropertyEvaluationModel extends BaseModel { + + /** + * 城市 + */ + private String cityName; + + /** + * 区域(新版本估价) + **/ + private String district; + + /** + * 小区名(新版本) + */ + private String name; + /** + * 地址 + */ + private String address; + + /** + * 面积 + */ + private double size; + + /** + * 所在楼层 + */ + private Integer floor; + + /** + * 总楼层 + */ + private Integer height; + + /** + * 室数 + */ + private Integer room; + + /** + * 厅数 + */ + private Integer hall; + + /** + * 卫数 + */ + private Integer toilet; + + /** + * 朝向 + */ + private String direction; + + /** + * 装修情况 + */ + private String fitment; + + private Map result; + + @Override + public String getCityName() { + return cityName; + } + + @Override + public void setCityName(String cityName) { + this.cityName = cityName; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public double getSize() { + return size; + } + + public void setSize(double size) { + this.size = size; + } + + public Integer getFloor() { + return floor; + } + + public void setFloor(Integer floor) { + this.floor = floor; + } + + public Integer getHeight() { + return height; + } + + public void setHeight(Integer height) { + this.height = height; + } + + public Integer getRoom() { + return room; + } + + public void setRoom(Integer room) { + this.room = room; + } + + public Integer getHall() { + return hall; + } + + public void setHall(Integer hall) { + this.hall = hall; + } + + public Integer getToilet() { + return toilet; + } + + public void setToilet(Integer toilet) { + this.toilet = toilet; + } + + public String getDirection() { + return direction; + } + + public void setDirection(String direction) { + this.direction = direction; + } + + public String getFitment() { + return fitment; + } + + public void setFitment(String fitment) { + this.fitment = fitment; + } + + public Map getResult() { + return result; + } + + public void setResult(Map result) { + this.result = result; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/LineChartsUtils.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/LineChartsUtils.java new file mode 100644 index 000000000..1ce0f9126 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/LineChartsUtils.java @@ -0,0 +1,137 @@ +package com.fangjia.open.util; + +import com.fangjia.core.util.DataUtil; +import com.fangjia.service.mongo.fangjia.FileService; +import org.bson.types.ObjectId; +import org.jfree.chart.ChartFactory; +import org.jfree.chart.ChartPanel; +import org.jfree.chart.ChartUtilities; +import org.jfree.chart.JFreeChart; +import org.jfree.chart.axis.NumberAxis; +import org.jfree.chart.plot.CategoryPlot; +import org.jfree.chart.plot.PlotOrientation; +import org.jfree.chart.renderer.category.LineAndShapeRenderer; +import org.jfree.chart.ui.ApplicationFrame; +import org.jfree.data.category.DefaultCategoryDataset; +import org.jfree.ui.RefineryUtilities; + +import java.awt.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +/** + * 折线图绘图工具类 + * + * @author shenjian + * @since 2021/4/9 + */ +public class LineChartsUtils { + + + public static void main(String[] args) throws IOException { + File file = new File("d://test.png"); + List columns = new ArrayList(); + columns.add("2020-02"); + columns.add("2020-03"); + columns.add("2020-04"); + columns.add("2020-05"); + columns.add("2020-06"); + columns.add("2020-07"); + columns.add("2020-08"); + columns.add("2020-09"); + columns.add("2020-10"); + columns.add("2020-11"); + columns.add("2020-12"); + columns.add("2021-01"); + + List values = new ArrayList(); + values.add(1000); + values.add(2000); + values.add(2000); + values.add(2000); + values.add(2000); + values.add(2000); + values.add(2000); + values.add(3000); + values.add(3000); + values.add(3000); + values.add(3000); + values.add(3000); + + createChartAndSave2Png("d://test.png", "1居室", columns, values); + } + + public static String createChartAndSave2Png(String path, String rowKey, List columns, List values) { + File file = new File(path); + try { + ChartUtilities.saveChartAsPNG(file, createChart(rowKey, columns, values),800,300); + } catch (IOException e) { + e.printStackTrace(); + } + return path; + } + + public static String createChartAndUpload(FileService fileService, String rowKey, List columns, List values) { + ByteArrayOutputStream os = new ByteArrayOutputStream(); + try { + ChartUtilities.writeChartAsPNG(os, createChart(rowKey, columns, values),800,300); + byte[] data = os.toByteArray(); + String id = new ObjectId().toString(); + fileService.save(id,"o", data, "image/png", "o"); + String url = "http://img0.fangjia.com/stc/fs/" + DataUtil.encodePicUrl(id, "o", "house"); + + return url; + + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (os != null) { + try { + os.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return null; + } + + /** + * 定义图表对象 + * @param rowKey 曲线名,如一居室 + * @param columns 横坐标名 + * @param values 纵坐标值 + */ + public static JFreeChart createChart(String rowKey, List columns, List values) { + createDataset(rowKey, columns, values); + // 折线图名称, 横坐标名称, 纵坐标名称 数据水平竖直 PlotOrientation.HORIZONTAL, 水平显示图像 true, 水平显示图像 true, include legend true, tooltips false, urls + JFreeChart chart = ChartFactory.createLineChart("", "", "", createDataset(rowKey, columns, values), PlotOrientation.VERTICAL, true, true, false); + CategoryPlot plot = chart.getCategoryPlot(); + plot.setRangeGridlinesVisible(false); // 是否显示格子线 + plot.setBackgroundAlpha(0.3f); // 设置背景透明度 + LineAndShapeRenderer renderer = (LineAndShapeRenderer) plot.getRenderer(); + renderer.setSeriesPaint(0, Color.BLUE); + NumberAxis rangeAxis = (NumberAxis) plot.getRangeAxis(); + rangeAxis.setStandardTickUnits(NumberAxis.createIntegerTickUnits()); + rangeAxis.setAutoRangeIncludesZero(true); + rangeAxis.setUpperMargin(0.20); + rangeAxis.setLabelAngle(Math.PI / 2.0); + return chart; + } + + private static DefaultCategoryDataset createDataset(String rowKey, List columns, List values) { + DefaultCategoryDataset dataset = new DefaultCategoryDataset(); + for (int i = 0; i < columns.size(); i++) { + String column = columns.get(i); + if (values.get(i) != null) { + dataset.addValue(Double.valueOf(values.get(i)), rowKey, column); + } else { + dataset.addValue(null, rowKey, column); + } + } + return dataset; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/OpenApiClient.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/OpenApiClient.java index 5389f0e2c..75c733d74 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/OpenApiClient.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/OpenApiClient.java @@ -38,6 +38,8 @@ public class OpenApiClient { // } JSONObject matchResult = request.getJsonContent(url, params, "UTF-8"); + + if(matchResult.getInt("code") == 200){ return matchResult.getJSONObject("result"); } diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl new file mode 100644 index 000000000..2a539183c --- /dev/null +++ b/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl @@ -0,0 +1,489 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + + + 绉熼噾鎶ュ憡涓績 + + + + + + + + + + + +
+
+ 浼板�兼姤鍛�涓嬭浇 +
+
+
1 璇勪及鐢虫槑
+
寤鸿閾惰閬靛惊涓珛銆佸瑙傘�佸叕姝g殑鍘熷垯锛岄�氳繃鍛ㄥ瘑缁嗚嚧鐨勬祴绠楋紝璇勪及姹傚緱鍒嗘瀽瀵硅薄鐨勬埧鍦颁骇甯傚満鍙傝�冦��
+
+
+
2 璇勪及鏃堕棿
+
+
+ 璇勪及缁撴灉
+ 妤肩洏鍚嶇О锛�
+ 妤肩洏鍦板潃锛�
+ 绉熼噾浼板�硷紙RMB锛夛細鍏�/鏈�
+ 澶у啓锛堜汉姘戝竵锛夛細
+
+
+
+
3 鎶ュ憡鏈夋晥鏈�
+
鏈姤鍛婂湪甯傚満鏃犺緝澶ф尝鍔ㄧ殑鎯呭喌涓嬶紝璇ヨ瘎浼颁环鏍煎湪鎶ュ憡鍑哄叿璧蜂笁涓湀鍐呮湁鏁堛��
+
+
+
4 鎴夸骇鐘跺喌
+
+ 璇︾粏鍦板潃锛�
+ 妤肩洏鍚嶇О锛�
+ 瀹ゅ彿锛�
+ 鏈濆悜锛�
+ 寤虹瓚闈㈢Н锛�骞崇背
+ 鎵�鍦ㄦゼ灞傦細 灞� 鎬诲眰鏁�
+ 鐢垫閰嶅锛�
+ 瑁呬慨鎯呭喌锛�
+ 寤虹瓚骞翠唬锛�
+
+
+
+
5 鍘嗗彶绉熼噾
+
+
+
+
6 宸茬鎴挎簮
+
+ + + + + + + + + + + + + + + + + +
鍩庡競鍖哄煙灏忓尯鍚�鎴愪氦浠�闈㈢Н瀹�鍘�瑁呬慨鎴愪氦鏃ユ湡
鏆傛棤鏁版嵁
+
+
+
+
7 鏍锋湰鍙傝��
+
+ + + + + + + + + + + + + + + + + +
鍩庡競鍖哄煙灏忓尯鍚�绉熼噾闈㈢Н瀹�鍘�瑁呬慨鎴愪氦鏃ユ湡
鏆傛棤鏁版嵁
+
+
+
+
8 鍛ㄨ竟鍚岀被灏忓尯绉熼噾
+
+ + + + + + + + + + + + + + + + +
鍩庡競鍖哄煙灏忓尯鍚�骞崇背绉熼噾瀹�鍘�
鏆傛棤鏁版嵁
+
+
+
+ + + + + + + + +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> + + + + \ No newline at end of file diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl new file mode 100644 index 000000000..615fef4c5 --- /dev/null +++ b/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl @@ -0,0 +1,236 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + + + 绉熼噾鎶ュ憡涓績 + + + + + + + + + + + +
+
+ 浼板�兼姤鍛� +
+
+
1 璇勪及鐢虫槑
+
寤鸿閾惰閬靛惊涓珛銆佸瑙傘�佸叕姝g殑鍘熷垯锛岄�氳繃鍛ㄥ瘑缁嗚嚧鐨勬祴绠楋紝璇勪及姹傚緱鍒嗘瀽瀵硅薄鐨勬埧鍦颁骇甯傚満鍙傝�冦��
+
+
+
2 璇勪及鏃堕棿
+
+ <#if result.cal_date??>${result.cal_date}
+ 璇勪及缁撴灉
+ 妤肩洏鍚嶇О锛�<#if result.name??>${result.name}
+ 妤肩洏鍦板潃锛�<#if result.address??>${result.address}
+ 绉熼噾浼板�硷紙RMB锛夛細<#if result.totalPrice??>${result.totalPrice}鍏�/鏈�
+ 澶у啓锛堜汉姘戝竵锛夛細<#if result.totalPriceUpper??>${result.totalPriceUpper}
+
+
+
+
3 鎶ュ憡鏈夋晥鏈�
+
鏈姤鍛婂湪甯傚満鏃犺緝澶ф尝鍔ㄧ殑鎯呭喌涓嬶紝璇ヨ瘎浼颁环鏍煎湪鎶ュ憡鍑哄叿璧蜂笁涓湀鍐呮湁鏁堛��
+
+
+
4 鎴夸骇鐘跺喌
+
+ 璇︾粏鍦板潃锛�<#if result.address??>${result.address}
+ 妤肩洏鍚嶇О锛�<#if result.name??>${result.name}
+ 瀹ゅ彿锛�<#if result.room??>${result.room}
+ 鏈濆悜锛�<#if result.direction??>${result.direction}
+ 寤虹瓚闈㈢Н锛�<#if result.size??>${result.size}骞崇背
+ 鎵�鍦ㄦゼ灞傦細<#if result.floor??>${result.floor} 灞� <#if result.height??>${result.height}鎬诲眰鏁�
+ 鐢垫閰嶅锛�<#if result.hasLift??>${result.hasLift}
+ 瑁呬慨鎯呭喌锛�<#if result.fitment??>${result.fitment}
+ 寤虹瓚骞翠唬锛�<#if result.buildYear??>${result.buildYear}
+
+
+
+
5 鍘嗗彶绉熼噾
+
+ <#if result.tradesImgUrl??> +<#-- --> + + <#else> +
+ + +
鏆傛棤鏁版嵁
+
+ +
+
+
+
6 宸茬鎴挎簮
+
+ + + + + + + + + + + + + + + + <#if (result.trades??&&result.trades?size>0)> + <#list result.trades as bo> + + + + + + + + + + + + + <#else> + + + +
鍩庡競鍖哄煙灏忓尯鍚�鎴愪氦浠�闈㈢Н瀹�鍘�瑁呬慨鎴愪氦鏃ユ湡
<#if bo.city??>${bo.city}<#if bo.region??>${bo.region}<#if bo.districtName??>${bo.districtName}<#if bo.totalPrice??>${bo.totalPrice}<#if bo.area??>${bo.area}<#if bo.room??>${bo.room}<#if bo.hall??>${bo.hall}<#if bo.fitment??>${bo.fitment}<#if bo.source??>${bo.source}
鏆傛棤鏁版嵁
+
+
+
+
7 鏍锋湰鍙傝��
+
+ + + + + + + + + + + + + + + + <#if (result.houses??&&result.houses?size>0)> + <#list result.houses as bo> + + + + + + + + + + + + + <#else> + + + +
鍩庡競鍖哄煙灏忓尯鍚�绉熼噾闈㈢Н瀹�鍘�瑁呬慨鎴愪氦鏃ユ湡
<#if bo.city??>${bo.city}<#if bo.region??>${bo.region}<#if bo.districtName??>${bo.districtName}<#if bo.totalPrice??>${bo.totalPrice}<#if bo.area??>${bo.area}<#if bo.room??>${bo.room}<#if bo.hall??>${bo.hall}<#if bo.fitment??>${bo.fitment}<#if bo.root??>${bo.root}
鏆傛棤鏁版嵁
+
+
+
+
8 鍛ㄨ竟鍚岀被灏忓尯绉熼噾
+
+ + + + + + + + + + + + + <#if (result.districts??&&result.districts?size>0)> + <#list result.districts as bo> + + + + + + + + + + <#else> + + + +
鍩庡競鍖哄煙灏忓尯鍚�骞崇背绉熼噾瀹�鍘�
<#if bo.city??>${bo.city}<#if bo.region??>${bo.region}<#if bo.districtName??>${bo.districtName}<#if bo.totalPrice??>${bo.totalPrice}<#if bo.room??>${bo.room}<#if bo.hall??>${bo.hall}
鏆傛棤鏁版嵁
+
+
+
+ + + \ No newline at end of file diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/index.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/index.ftl new file mode 100644 index 000000000..8633e3e89 --- /dev/null +++ b/projects/fangjia-open/src/main/webapp/ccbRent/index.ftl @@ -0,0 +1,403 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + + 绉熼噾璇勪及 + + + + + + + + + + + +
+
+ +
+
+
+
    +
  • +
    +
    + + +
    鍩庡競锛�涓婃捣
    +
    +
    +
  • +
  • +
    +
    +
    鍦板潃锛�
    +
    + + +
    + + +
    锛堝繀濉」锛�
    +
    +
    +
    +
      +
      +
    • +
    • +
      +
      +
      闈㈢Н锛�
      +
      + +
      +
      锛堝繀濉」锛�
      +
      +
      +
    • +
    • +
      +
      +
      +
      鎴峰瀷锛�
      + + + +

      + 1瀹�    0鍘�    0鍗� +

      +
      +
      +
      +
    • +
    • +
      +
      +
      妤煎眰锛�
      +
      + +
      +
      锛堝繀濉」锛�
      +
      +
      +
    • +
    • +
      +
      +
      鎬绘ゼ灞傦細
      +
      + +
      +
      锛堝繀濉」锛�
      +
      +
      +
    • +
    + +
    缁х画濉啓锛岀閲戞洿鍔犵簿鍑嗏啌
    +
    鏀惰捣
    +
    + +
    +
    +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/report.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/report.ftl new file mode 100644 index 000000000..9085c3fc6 --- /dev/null +++ b/projects/fangjia-open/src/main/webapp/ccbRent/report.ftl @@ -0,0 +1,69 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + + 绉熼噾鎶ュ憡涓績 + + + + + + + + + +
    +
    +
    +
    + <杩斿洖 +
      +
    • +
      +
      +
      鎮ㄨ瘎浼扮殑鍦板潃锛�
      +
      + +
      +
      +
      +
    • +
    • +
      +
      +
      绉熼噾锛�
      +
      + +
      +
      +
      +
    • +
    +
    + +
    +
    +
    + + + + + + + + \ No newline at end of file diff --git a/projects/fangjia-open/src/main/webapp/static/js/autoCompletion.js b/projects/fangjia-open/src/main/webapp/static/js/autoCompletion.js index b41b4d00e..53627a5fc 100644 --- a/projects/fangjia-open/src/main/webapp/static/js/autoCompletion.js +++ b/projects/fangjia-open/src/main/webapp/static/js/autoCompletion.js @@ -1,10 +1,15 @@ /**灏忓尯鎼滅储鍔熻兘js*/ $(function () { - resumeHistory() + if ($("#t").val() != "c") { + resumeHistory() + } /**灏忓尯鑷姩瀹屾垚*/ $("#districtSearch").on('click input',function () { var city = $("#cityName").val() if($.trim($("#districtSearch").val()) == ""){ + if ($("#t").val() == "c") { + return false; + } resumeHistory() return; } @@ -21,26 +26,34 @@ $(function () { }, dataType: "json", success: function (data) { - if(data.length == 0){ + if(data && data.length == 0){ var content = '
  • 鏈悳绱㈠埌灏忓尯
  • ' $("#searchSpan ul").empty().append(content) return } - var template = '
  • {1}
    {2}
  • ' + var template = '
  • {1}
    {2}
  • ' var content = "" $(data).each(function () { var district = this - content = content + template.template(district.id, district.keyword, district.desc) + content = content + template.template(district.id, district.keyword, district.desc, district.region) }) $("#searchSpan ul").empty().append(content).find("li>a.item-link").click(function () { var li = $(this).parent(); var addr = $(li).attr("data-addr"); var id = $(li).attr("data-id")+""; var name = $(li).attr("data-name"); + var region = $(li).attr("data-region"); var isCompany=$("#t").val(); - saveCookie(id, name, addr) + if ($("#t").val() != "c") { + saveCookie(id, name, addr) + } if ($("#t").val() == "b") { location.href = "districtDetail?id=" + id+"&city="+city + } else if ($("#t").val() == "c") { + $('#districtSearch').val(name) + $('input[name="address"]').val(addr) + $('input[name="district"]').val(region) + $("#searchSpan ul").empty() } else { location.href = "../weiXinEvaluation/input?id=" + id } @@ -98,6 +111,8 @@ function resumeHistory() { var id = $(li).attr("data-id") if ($("#t").val() == "b") { location.href = "districtDetail?id=" + id+"&city="+city + } else if ($("#t").val() == "c") { + location.href = "../ccbRent/index?city="+city } else { location.href = "../weiXinEvaluation/input?id=" + id } diff --git a/projects/fangjia-service/pom.xml b/projects/fangjia-service/pom.xml index b0f0ff8f8..723fc818c 100644 --- a/projects/fangjia-service/pom.xml +++ b/projects/fangjia-service/pom.xml @@ -29,7 +29,7 @@ org.sothis sothis-core - 0.2.0-SNAPSHOT + 0.2.0 provided diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserPatterns.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserPatterns.java index aec6c11b2..6015a13ea 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserPatterns.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserPatterns.java @@ -7,14 +7,14 @@ import java.util.regex.Pattern; */ public interface AddressParserPatterns { - Pattern FULL_ADDRESS = Pattern.compile("^.{2,}(路|街|大道|巷|道|((一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([甲乙]?[一二三四五六七八九十百千\\d]+甲?号?)(?!楼)[~\\-~、,-])?([甲乙]?[一二三四五六七八九十百千\\d])+甲?(号)(?!楼))"); - Pattern STREET = Pattern.compile("^.{2,}(路|街|大道|巷|道|((一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?"); - Pattern STREET_NUMBER = Pattern.compile(".*([甲乙]?[一二三四五六七八九十百千\\d]+甲?(号)(?!楼)?[~\\--~、,])?([甲乙]?[一二三四五六七八九十百千\\d]+甲?(号)(?!楼))"); - Pattern STAGE_PATTERN = Pattern.compile("(([一二三四五六七八九十百千\\d]+)期?[,、至到]?)?([一二三四五六七八九十百千\\d]+)期"); - Pattern PARTITION_PATTERN = Pattern.compile("(\\w|东|南|北|中|西|甲|乙|丙|丁|一|二|三|四|五|六|七|八|九|十)+(区|坊)"); + Pattern FULL_ADDRESS = Pattern.compile("^.{2,}(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([甲乙]?[零一二三四五六七八九十百千\\d]+甲?号?)(?!楼)[~\\-~、,-])?([甲乙]?[零一二三四五六七八九十百千\\d])+甲?(号)(?!楼)+([付附]+[零一二三四五六七八九十百千\\d]+(号)?)?)"); + Pattern STREET = Pattern.compile("^.{2,}(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?"); + Pattern STREET_NUMBER = Pattern.compile(".*([甲乙]?[零|一三四五六七八九十百千\\d]+甲?(号)(?!楼)?[~\\--~、,])?([甲乙]?[零一二三四五六七八九十百千\\d]+甲?(号)(?!楼)+([付附]+[零一二三四五六七八九十百千\\d]+(号)?)?)"); + Pattern STAGE_PATTERN = Pattern.compile("(([零一二三四五六七八九十百千\\d]+)期?[,、至到]?)?([零一二三四五六七八九十百千\\d]+)期"); + Pattern PARTITION_PATTERN = Pattern.compile("(\\w|东|南|北|中|西|甲|乙|丙|丁|零|一|二|三|四|五|六|七|八|九|十)+(区|坊)"); Pattern TOWN = Pattern.compile("^.+?(乡|镇|街道)+"); Pattern NUMBER = Pattern.compile("\\d+"); - Pattern STANDARD_ADDRESS = Pattern.compile("^.{2,}(路|街|大道|巷|道|((一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([一二三四五六七八九十百千\\d])+弄)|([甲乙]?([一二三四五六七八九十百千\\d]))+号(?!楼))"); + Pattern STANDARD_ADDRESS = Pattern.compile("^.{2,}(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([零一二三四五六七八九十百千\\d])+弄)|([甲乙]?([零一二三四五六七八九十百千\\d]))+号(?!楼)+([付附]+[零一二三四五六七八九十百千\\d]+(号)?)?)"); Pattern DISTRICT = Pattern.compile("^.{2,}?(区|县)"); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java index d323f797b..47d32dc97 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java @@ -169,7 +169,9 @@ public class AddressParserServiceImpl implements AddressParserService { aliyunBo = aliyunService.addressStand(params.getAddress(), params.getCity()); if(aliyunBo != null){ String poi = ((aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi())).replaceAll("\\s*", ""); - addr.setKeywords(poi); + if(StringUtils.isNotBlank(poi)){ + addr.setKeywords(poi); + } if(StringUtils.isNotBlank(aliyunBo.getCity())){ addr.setSuggestCity(aliyunBo.getCity()); } @@ -222,15 +224,13 @@ public class AddressParserServiceImpl implements AddressParserService { if(StringUtils.isBlank(addr.getTownship())){ addr.setTownship(aliyunBo.getTown()); } - if(StringUtils.isBlank(addr.getBuildingNumber())){ - addr.setBuildingNumber(aliyunBo.getHouseno()); - } - if(StringUtils.isBlank(addr.getUnitNumber())){ - addr.setUnitNumber(aliyunBo.getCellno()); - } - if(StringUtils.isBlank(addr.getRoomNumber())){ - addr.setRoomNumber(aliyunBo.getRoomno()); - } + addr.setOrgBuildingNumber(aliyunBo.getHouseno()); + addr.setBuildingNumber(aliyunBo.getHouseno()); + addr.setOrgUnitNumber(aliyunBo.getCellno()); + addr.setUnitNumber(aliyunBo.getCellno()); + addr.setOrgRoomNumber(aliyunBo.getRoomno()); + addr.setRoomNumber(aliyunBo.getRoomno()); + if(StringUtils.isBlank(addr.getStreet())){ addr.setStreet(aliyunBo.getRoad()); } @@ -440,17 +440,37 @@ public class AddressParserServiceImpl implements AddressParserService { if (connStreetNumber != null) { int index = address.indexOf(connStreetNumber); String remain = address.substring(0, index); - String unit = "号"; - String[] split = connStreetNumber.substring(0, connStreetNumber.length() - 1).split("-"); - if (split.length > 1 && remain.length() > 1) { - int start = Integer.parseInt(split[0]); - int end = Integer.parseInt(split[1]); - if(start < end){ - String addr; - for (int i = start; i <= end; i++) { - addr = remain + i + unit; - if (!addrAlias.contains(addr)) { - addrAlias.add(addr); + String[] split = connStreetNumber.split("(~|-|~)"); + String[] splitComma = connStreetNumber.split("(,|,|、)"); +// String unit = "号"; +// String[] split = connStreetNumber.substring(0, connStreetNumber.length() - 1).split("-"); + if(remain.length() > 1){ + if (split.length > 1) { + List unitList = getSplitUnit(split); + String regularStr = "(" + StringUtils.join(unitList, "|") + ")"; + int start = Integer.parseInt(split[0].replaceAll(regularStr, "")); + int end = Integer.parseInt(split[1].replaceAll(regularStr, "")); + for(String unit:unitList){ + if(start < end){ + String addr; + for (int i = start; i <= end; i++) { + addr = remain + i + unit; + if (!addrAlias.contains(addr)) { + addrAlias.add(addr); + } + } + } + } + } + if(splitComma.length > 1){ + List unitList = getSplitUnit(splitComma); + for(String unit:unitList){ + for(String value:splitComma){ + int num = Integer.parseInt(value.replaceAll(StringUtils.join(Collections.singleton("(" + StringUtils.join(unitList, "|") + ")"), "|"), "")); + String addr = remain + num + unit; + if (!addrAlias.contains(addr)) { + addrAlias.add(addr); + } } } } @@ -473,6 +493,16 @@ public class AddressParserServiceImpl implements AddressParserService { } } + private List getSplitUnit(String[] split){ + List unitList = new ArrayList(); + for(String value:split){ + String unit = StringUtils.join(DataUtil.getHanzi(value), ""); + if(StringUtils.isNotBlank(unit)){ + unitList.add(unit); + } + } + return unitList; + } /** * 在CPDB库中查询匹配到的数据 * @@ -955,15 +985,18 @@ public class AddressParserServiceImpl implements AddressParserService { && address.getStreetNumber().endsWith(address.getOrgBuildingNumber())){ }else{ - formattedAddressBuilder.append(address.getBuildingNumber() + "栋"); + formattedAddressBuilder.append(address.getBuildingNumber()); +// formattedAddressBuilder.append(address.getBuildingNumber() + "栋"); } } if(StringUtils.isNotBlank(address.getOrgUnitNumber())){ - formattedAddressBuilder.append(address.getUnitNumber() + "单元"); + formattedAddressBuilder.append(address.getUnitNumber()); +// formattedAddressBuilder.append(address.getUnitNumber() + "单元"); } if(StringUtils.isNotBlank(address.getOrgRoomNumber())){ - formattedAddressBuilder.append(address.getRoomNumber() + "室"); + formattedAddressBuilder.append(address.getRoomNumber()); +// formattedAddressBuilder.append(address.getRoomNumber() + "室"); } address.setFormattedAddress(formattedAddressBuilder.toString()); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserUtil.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserUtil.java index e1f4b1338..490c3dbb4 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserUtil.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserUtil.java @@ -23,7 +23,7 @@ public class AddressParserUtil { static final Pattern STREET_PATTERN = Pattern.compile("^.+(路|街道|弄|街|道|巷)"); static final Pattern CONNECTOR_PATTERN = Pattern.compile("~|-|~"); - public static final Pattern STREET_NUMBER_CONNECTOR_PATTERN = Pattern.compile("\\d+(~|-|~)\\d+号"); + public static final Pattern STREET_NUMBER_CONNECTOR_PATTERN = Pattern.compile("(\\d+)(支弄|号|弄)?(~|-|~|,|,|、)\\d+(支弄|号|弄)"); static final Pattern SEPARATOR_PATTERN = Pattern.compile("、|,"); static final Pattern STREET_NUMBER_PATTERN = Pattern.compile("(\\d+(~|-|~|、|,))*\\d+(号|栋|幢)"); static final Pattern UNIT_NUMBER_PATTERN = Pattern.compile("(\\w+室)|(\\w+(号|栋|幢|单元))\\w+(室)*"); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java index 4cfc89037..cc1334533 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java @@ -250,6 +250,19 @@ public class AddressFormatterFactory { } }); + /** + * 一环路东二段162 + */ + formatters.add(new AbstractAddressFormatter(Pattern.compile(".*(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([零一二三四五六七八九十百千\\d])+弄)|([甲乙]?\\d+$))")) { + final Pattern TARGET = Pattern.compile("(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([零一二三四五六七八九十百千\\d])+弄)|([甲乙]?\\d+$))"); + + @Override + protected String doFormat(String address) { + String matchStr = DataUtil.match(address, TARGET); + String formatStr = matchStr + "号"; + return address.replace(matchStr,formatStr); + } + }); } public List getFormatters(){ diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java index 21a79a722..2e286a5ed 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java @@ -427,12 +427,12 @@ public class Address { } public void setOrgRoomNumber(String orgRoomNumber) { - if(orgRoomNumber.length() > 2){ - orgRoomNumber = orgRoomNumber.replaceFirst("^0+", ""); - } if(StringUtils.isNotBlank(orgRoomNumber)){ - this.orgRoomNumber = orgRoomNumber; + if(orgRoomNumber.length() > 2){ + orgRoomNumber = orgRoomNumber.replaceFirst("^0+", ""); + } } + this.orgRoomNumber = orgRoomNumber; } public String getKeywords() { diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/CityData.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/CityData.java index ab21931c7..8225e00c0 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/CityData.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/CityData.java @@ -14,8 +14,8 @@ public class CityData { put("文山州", Arrays.asList("文山壮族苗族自治州")); put("凉山州", Arrays.asList("凉山彝族自治州")); - put("呼和浩特", Arrays.asList("呼市")); - put("乌鲁木齐", Arrays.asList("乌市")); +// put("呼和浩特", Arrays.asList("呼市")); +// put("乌鲁木齐", Arrays.asList("乌市")); put("阿里", Arrays.asList("阿里地区")); put("红河", Arrays.asList("红河哈尼族彝族自治州")); put("克孜勒苏", Arrays.asList("克孜勒苏柯尔克孜自治州", "克州")); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java index f8ebb93bf..2dd886f8b 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java @@ -58,9 +58,6 @@ public class CityProcessor extends AbstractAddressProcessor { List possibleCities = speculateCityNameByRegion(address, city); if(isUnique(possibleCities)){ formatCity = getFirst(possibleCities); - if(StringUtils.isBlank(address.getSuggestDistrict())){ - address.setSuggestDistrict(city); - } } } if(null != formatCity){ diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java index e03aa4576..b45bffb81 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java @@ -523,6 +523,8 @@ public interface DistrictService extends ModeService { List findNearestDistrict(District district, int radiusMeters, int limit); + List findNearestDistrict(District district, int radiusMeters, String[] fields, int limit); + List findNearestDistrict(String city, Double lng, Double lat, int radiusMeters, int limit); int findPeopleDensity(District district); 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 77b6f344c..19e45d136 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 @@ -2292,6 +2292,22 @@ public class DistrictServiceImpl implements DistrictService { return list; } + + public List findNearestDistrict(District district, int radiusMeters, String[] fields, int limit) { + String cacheKey = district.getCity() + "#" + district.getRegion() + "#" + district.getName() + "#" + radiusMeters + "#" + limit; + Object obj = CacheUtils.getValue(this.getClass(), cacheKey); + if (obj != null) { + return (List) obj; + } + ArrayList list = new ArrayList(); + List nlist = doFindNearestDistrict(district, radiusMeters, fields, limit); + if (nlist.size() > 0) { + list = (ArrayList) nlist; + } + CacheUtils.putValue(CachePolicyEnum.LONG, this.getClass(), cacheKey, list); + return list; + } + @Override public List findNearestDistrict(String city, Double lng, Double lat, int radiusMeters, int limit) { @@ -2408,17 +2424,48 @@ public class DistrictServiceImpl implements DistrictService { } } } + + if (ret.size() > limit) { + ret = ret.subList(0, limit); + } + + return new ArrayList(ret); + } + + + public List doFindNearestDistrict(District district, int radiusMeters, String[] fields, int limit) { + if (district == null || district.getLat() == null || district.getLng() == null || district.getLat() <= 0 + || district.getLng() <= 0) { + return Collections.EMPTY_LIST; + } + + List params = new ArrayList(); + params.add(new QueryParam("category", "district")); + params.add(new QueryParam("city", district.getCity())); + params.add(new QueryParam("visible", 0)); + SdQuery sdQuery = new SdQuery(); + sdQuery.setPoint((double) district.getLat() / 10000000000.0 + "," + (double) district.getLng() / 10000000000.0); + sdQuery.setField("lat_lng"); + sdQuery.setDistance(String.valueOf((double) radiusMeters / 1000.0)); + params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery)); + List list = districtDao.findAllByParams(params, null, 0, limit * 2, fields); + if (list.size() == 0) { + return Collections.EMPTY_LIST; + } + + List ret = new ArrayList(); for (District d : list) { if (district.getName().equals(d.getName()) && district.getRegion().equals(d.getRegion()) && district.getCity().equals(d.getCity())) { continue; } if (d.getEstateType2() != null) { - if ("普通住宅".equals(district.getEstateType2())) { + if (d.getEstateType2().indexOf(district.getEstateType2()) > -1) { ret.add(d); } } } + if (ret.size() > limit) { ret = ret.subList(0, limit); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/EvaluationService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/EvaluationService.java index e88427d0f..a03240167 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/EvaluationService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/EvaluationService.java @@ -80,6 +80,16 @@ public interface EvaluationService { Evaluation evaluateWithPadding(Evaluation evaluation,Date weekend); Evaluation evaluate(District district, Evaluation evaluation , Date weekend); + + + /** + * 根据条件对小区进行租金估价 + * @param district + * @param evaluation + * @param weekend + * @return + */ + Evaluation evaluateRent(District district, Evaluation evaluation, Date weekend); /** * 友达评估 diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/EvaluationServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/EvaluationServiceImpl.java index 40d75b84d..eded73b3f 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/EvaluationServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/EvaluationServiceImpl.java @@ -14,6 +14,9 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.fangjia.dal.mongo.model.*; +import com.fangjia.service.district.DistrictRoomSqmetreRentService; +import com.fangjia.service.district.SqmetreRentService; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; @@ -41,17 +44,6 @@ import com.fangjia.dal.mongo.dao.EvaluationDao; import com.fangjia.dal.mongo.dao.EvaluationHistoryDao; import com.fangjia.dal.mongo.dao.HouseLoudongDao; import com.fangjia.dal.mongo.fangjia.model.ServerArea; -import com.fangjia.dal.mongo.model.ApiUserCfg; -import com.fangjia.dal.mongo.model.BusStation; -import com.fangjia.dal.mongo.model.DistrictAnalyData; -import com.fangjia.dal.mongo.model.DistrictSellStat; -import com.fangjia.dal.mongo.model.DistrictStat; -import com.fangjia.dal.mongo.model.DistrictStatRent; -import com.fangjia.dal.mongo.model.Evaluation; -import com.fangjia.dal.mongo.model.EvaluationHistory; -import com.fangjia.dal.mongo.model.HouseLoudong; -import com.fangjia.dal.mongo.model.RegionBlock; -import com.fangjia.dal.mongo.model.YdDealPrice; import com.fangjia.dal.mongo.pds.model.HourseTypeStat; import com.fangjia.dal.seaweed.model.District; import com.fangjia.service.api.ApiUserCfgService; @@ -96,6 +88,10 @@ public class EvaluationServiceImpl implements EvaluationService { private DistrictSellStatService districtSellStatService; private ApiUserCfgService apiUserCfgService; + private SqmetreRentService sqmetreRentService; + + private DistrictRoomSqmetreRentService districtRoomSqmetreRentService; + private final static Logger LOGGER = LoggerFactory.getLogger(EvaluationServiceImpl.class); public static final Map> CREDIT_RATE_MAP = new HashMap>(); @@ -1030,6 +1026,33 @@ public class EvaluationServiceImpl implements EvaluationService { return wrapEvaluation(district,evaluation,weekend,stat); } + + @Override + public Evaluation evaluateRent(District district, Evaluation evaluation, Date weekend) { + + if (null == evaluation.getFloor() || 0 == evaluation.getFloor() || null == evaluation.getHeight() || 0 == evaluation.getHeight()) { + evaluation.setFloor(null); + evaluation.setHeight(null); + } + + + SqmetreRent sqmetreRent = sqmetreRentService.findNearestSqmetreRent(district.getCity(), district.getRegion(), district.getName(), DateUtil.formatToYYYYMMDD(weekend), "district"); + if(sqmetreRent!=null){ + long totalPrice = evaluationRateService.evaluationRent(sqmetreRent.getAvgPrice(), evaluation); + + evaluation.setTotalPrice(((Number) (totalPrice)).intValue()); + + evaluation.setEvaluateWay(sqmetreRent.getSampleEnum()); + evaluation.setCredit(sqmetreRent.getCredit()); + }else{ + evaluation.setTotalPrice(null); + } + if(weekend != null) { + evaluation.setWeekend(weekend); + } + return evaluation; + } + /** * 友达评估接口 */ @@ -1338,6 +1361,10 @@ public class EvaluationServiceImpl implements EvaluationService { this.apiUserCfgService = apiUserCfgService; } + public void setSqmetreRentService(SqmetreRentService sqmetreRentService) { + this.sqmetreRentService = sqmetreRentService; + } + @Override public long findUserEvaluationCount(long userId, Date startDate, Date endDate, String source) { List params = new ArrayList(); @@ -1782,7 +1809,7 @@ public class EvaluationServiceImpl implements EvaluationService { * 封装价格 * @author yinjihuan * @param dto - * @param model + * @param evaluation */ private void buildPrice(EvaluationBeforeLoanBean dto, Evaluation evaluation) { // 获取房屋总价 @@ -1808,7 +1835,7 @@ public class EvaluationServiceImpl implements EvaluationService { * 小区年涨幅 * @author yinjihuan * @param dto - * @param model + * @param evaluation */ private void buildOneYearUpDownRange(EvaluationBeforeLoanBean dto, Evaluation evaluation) { List districtsSellStats = districtSellStatService.getAllWithMonths(evaluation.getCity(), evaluation.getRegion(), evaluation.getDistrictName(), 12); @@ -1824,7 +1851,7 @@ public class EvaluationServiceImpl implements EvaluationService { * 上个月参考均价 * @author yinjihuan * @param dto - * @param model + * @param evaluation */ private void buildTopMonthAvgPrice(EvaluationBeforeLoanBean dto, Evaluation evaluation) { String topMonth = DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -1), "yyyyMM"); @@ -1839,7 +1866,7 @@ public class EvaluationServiceImpl implements EvaluationService { * 涨跌幅在城市排名 * @author yinjihuan * @param dto - * @param key + * @param evaluation */ private void buildUpDownRangecityLevel(EvaluationBeforeLoanBean dto, Evaluation evaluation, DistrictAnalyData districtAnalyData) { Double increaseRate = 0d; @@ -1858,7 +1885,7 @@ public class EvaluationServiceImpl implements EvaluationService { * 获得最近一期的小区均价 * @author yinjihuan * @param dto - * @param model + * @param evaluation */ private void buildWeekAvgPrice(EvaluationBeforeLoanBean dto, Evaluation evaluation) { DistrictStatBo bo = getNearestDistrictStat(new DistrictKey(evaluation.getCity(), evaluation.getRegion(), evaluation.getDistrictName())); @@ -1992,4 +2019,8 @@ public class EvaluationServiceImpl implements EvaluationService { } return evaluationDao.findCountByParams(params); } + + public void setDistrictRoomSqmetreRentService(DistrictRoomSqmetreRentService districtRoomSqmetreRentService) { + this.districtRoomSqmetreRentService = districtRoomSqmetreRentService; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictRoomSqmetreRentService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictRoomSqmetreRentService.java new file mode 100644 index 000000000..987a46469 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictRoomSqmetreRentService.java @@ -0,0 +1,14 @@ +package com.fangjia.service.district; + +import com.fangjia.dal.mongo.model.DistrictRoomSqmetreRent; +import com.fangjia.dal.seaweed.model.District; + +import java.util.List; +import java.util.Map; + +public interface DistrictRoomSqmetreRentService { + + List findDistrictRoomSqmetreRents(District district, int periodCount, int houseType); + + Map getRentTrends(String city, String region, String name, int room, int count); +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictRoomSqmetreRentServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictRoomSqmetreRentServiceImpl.java new file mode 100644 index 000000000..c1d4eafa8 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictRoomSqmetreRentServiceImpl.java @@ -0,0 +1,101 @@ +package com.fangjia.service.district; + +import com.fangjia.core.util.CacheUtils; +import com.fangjia.core.util.DateUtil; +import com.fangjia.dal.QueryParam; +import com.fangjia.dal.SortParam; +import com.fangjia.dal.mongo.dao.DistrictRoomSqmetreRentDao; +import com.fangjia.dal.mongo.model.DistrictRoomSqmetreRent; +import com.fangjia.dal.mongo.model.DistrictStatRent; +import com.fangjia.dal.seaweed.model.District; +import com.fangjia.service.bo.DistrictStatRentBo; + +import java.util.*; + +public class DistrictRoomSqmetreRentServiceImpl implements DistrictRoomSqmetreRentService{ + + private DistrictRoomSqmetreRentDao districtRoomSqmetreRentDao; + + @Override + public List findDistrictRoomSqmetreRents(District district, int periodCount, int houseType) { + String cacheKey = district.getCity() + "_" + district.getRegion() + "_" + district.getName() + "_" + periodCount + "_" + houseType+"_room_rent"; +// Object obj = CacheUtils.getValue(this.getClass(), cacheKey); +// if (obj != null) { +// return (List) obj; +// } + List values = doFindLatestDistrictStatRent(district, periodCount, houseType); + CacheUtils.putValue(CacheUtils.CachePolicyEnum.LONG, this.getClass(), cacheKey, new ArrayList(values)); + return values; + } + + @Override + public Map getRentTrends(String city, String region, String name, int room, int count) { + List dates = DateUtil.getLastDayBetweenDates(DateUtil.addMonthToDate(new Date(),count), new Date()); + + List times = new ArrayList(); + for(Date date : dates){ + times.add(org.apache.tools.ant.util.DateUtils.format(date, "yyyyMM")); + } + +// List districtRents = findDistrictStatRentsByParams(city, region, name, null, dates.get(0), dates.get(dates.size()-1), null, null, null, null, true); + List districtRents = findRentTrends(city, region, name, room, count); + Map> distMap = null; + List rooms = null; + + if(null != districtRents){ + distMap = new HashMap>(); + rooms = new ArrayList(); + for(DistrictRoomSqmetreRent rent : districtRents){ + + Map priceMap = distMap.get(String.valueOf(room)); + if(null == priceMap){ + priceMap = new HashMap(); + distMap.put(String.valueOf(room), priceMap); + } + + priceMap.put(String.valueOf(rent.getsDate()), rent.getAvgPrice()); + } + } + + Map retMap = new HashMap(); + if(rooms != null){ + retMap.put("times", times); + retMap.put("distMap", distMap); + retMap.put("room", room); + } + return retMap; + } + + + private List findRentTrends(String city, String region, String name, int room, int count){ + String date = DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), count), "yyyyMM"); + + List params = new ArrayList(); + params.add(new QueryParam("city", city)); + params.add(new QueryParam("region", region)); + params.add(new QueryParam("districtName", name)); + params.add(new QueryParam("houseType",room)); + params.add(new QueryParam("sDate", QueryParam.GREATER_THAN_EQUAL_OPERATOR, Integer.parseInt(date))); + List sortParams = new ArrayList(); + sortParams.add(new SortParam("sDate", false)); + return districtRoomSqmetreRentDao.findAllByParams(params, sortParams, 0, count); + } + + + private List doFindLatestDistrictStatRent(District district, int periodCount, int houseType){ + + List params = new ArrayList(); + params.add(new QueryParam("city", district.getCity())); + params.add(new QueryParam("region", district.getRegion())); + params.add(new QueryParam("districtName", district.getName())); + params.add(new QueryParam("houseType",houseType)); +// params.add(new QueryParam("sDate", QueryParam.GREATER_THAN_EQUAL_OPERATOR, calendar.getTime())); + List sortParams = new ArrayList(); + sortParams.add(new SortParam("sDate", false)); + return districtRoomSqmetreRentDao.findAllByParams(params, sortParams, 0, periodCount); + } + + public void setDistrictRoomSqmetreRentDao(DistrictRoomSqmetreRentDao districtRoomSqmetreRentDao) { + this.districtRoomSqmetreRentDao = districtRoomSqmetreRentDao; + } +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatRentService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatRentService.java index 1a3f62b36..2d7fcb3d6 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatRentService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatRentService.java @@ -140,4 +140,13 @@ public interface DistrictStatRentService { List findLatestDistrictStatRent(District district, int periodCount, int houseType); + + + Map getRentTrend(String city, String region, String name, Integer count); + + + + + + } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatRentServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatRentServiceImpl.java index 1c2b171bb..aabd73608 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatRentServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatRentServiceImpl.java @@ -898,6 +898,50 @@ public class DistrictStatRentServiceImpl implements DistrictStatRentService { } + @Override + public Map getRentTrend(String city, String region, String name, Integer count) { + List dates = DateUtil.getLastDayBetweenDates(DateUtil.addMonthToDate(new Date(),count), new Date()); + + List times = new ArrayList(); + for(Date date : dates){ + times.add(org.apache.tools.ant.util.DateUtils.format(date, "yyyy-MM")); + } + + List districtRents = findDistrictStatRentsByParams(city, region, name, null, dates.get(0), dates.get(dates.size()-1), null, null, null, null, true); + Map> distMap = null; + List rooms = null; + + if(null != districtRents){ + distMap = new HashMap>(); + rooms = new ArrayList(); + for(DistrictStatRentBo rent : districtRents){ + + DistrictStatRent distRent = rent.getDistrictStatRent(); + if(null == distRent){ + distRent = rent.getVillaDistrictStatRent(); + } + + Map priceMap = distMap.get(distRent.getHouseType().toString()); + if(null == priceMap){ + rooms.add(distRent.getHouseType()); + priceMap = new HashMap(); + distMap.put(distRent.getHouseType().toString(), priceMap); + } + + priceMap.put(org.apache.tools.ant.util.DateUtils.format(distRent.getEndMonthDate(), "yyyy-MM"), distRent.getAvgPrice()); + } + } + + Map retMap = new HashMap(); + if(rooms != null){ + Collections.sort(rooms); + retMap.put("times", times); + retMap.put("distMap", distMap); + retMap.put("rooms", rooms); + } + return retMap; + } + private List doFindLatestDistrictStatRent(District district, int periodCount, int houseType){ Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.MONTH, -4); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/district/RentDealPriceService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/district/RentDealPriceService.java new file mode 100644 index 000000000..5d2f1298c --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/district/RentDealPriceService.java @@ -0,0 +1,10 @@ +package com.fangjia.service.district; + +import com.fangjia.dal.mongo.model.RentDealPrice; + +import java.util.List; + +public interface RentDealPriceService { + + List getRentDealPrices(String city, String region, String districtName, int limit); +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/district/RentDealPriceServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/district/RentDealPriceServiceImpl.java new file mode 100644 index 000000000..bd8ae26c4 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/district/RentDealPriceServiceImpl.java @@ -0,0 +1,44 @@ +package com.fangjia.service.district; + +import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.QueryParam; +import com.fangjia.dal.SortParam; +import com.fangjia.dal.mongo.dao.DistrictRoomSqmetreRentDao; +import com.fangjia.dal.mongo.dao.RentDealPriceDao; +import com.fangjia.dal.mongo.model.RegionStat; +import com.fangjia.dal.mongo.model.RentDealPrice; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +public class RentDealPriceServiceImpl extends MongoDaoImpl implements RentDealPriceService{ + + private RentDealPriceDao dentDealPriceDao; + + public void setDentDealPriceDao(RentDealPriceDao dentDealPriceDao) { + this.dentDealPriceDao = dentDealPriceDao; + } + + @Override + public List getRentDealPrices(String city, String region, String districtName, int limit) { + + List params = new ArrayList(); + params.add(new QueryParam("city", city)); + if (StringUtils.isNotBlank(region)) { + params.add(new QueryParam("region", region)); + } else { + params.add(new QueryParam("region", null)); + } + if (StringUtils.isNotBlank(districtName)) { + params.add(new QueryParam("districtName", districtName)); + } else { + params.add(new QueryParam("districtName", null)); + } + + List sortParms = new ArrayList(1); + sortParms.add(new SortParam("tradeDate", true)); + List list = findAllByParams(params, sortParms, limit); + return list; + } +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterService.java index c530b9a94..edc15e855 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterService.java @@ -12,8 +12,13 @@ public interface SeawaterService { List findSeawaters(String category, String city, String region, String name, List alias, List regionAlias, Integer startDate, Integer endDate, Integer room, String root, String sort, boolean order, int start, int limit ,String[] keys); + List findSeawatersFromEs(String category, String city, String region, String name, List alias, List regionAlias, Integer startDate, Integer endDate, - Integer room, String root, String sort, boolean order, int start, int limit ,String[] keys,String table); + Integer room, String root, String sort, boolean order, int start, int limit ,String[] keys,String table); + + List findSeawatersFromEs2(String category, String city, String region, String name, List alias, List regionAlias, Integer startDate, Integer endDate, + Double startArea, Double endArea, Integer startPrice, Integer endPrice, Integer room, String root, String sort, boolean order, int start, int limit ,String[] keys,String table); + long findSeawatersCount(String category, String city, String region, String name, List alias, List regionAlias, Integer startDate, Integer endDate, Integer room, String root); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterServiceImpl.java index b3988c69f..d7e31ca58 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterServiceImpl.java @@ -64,7 +64,7 @@ public class SeawaterServiceImpl implements SeawaterService { } return sells; } - + private Seawater convertDBObjectToSeawater(DBObject dbo) { Seawater seawater = new Seawater(); @@ -161,6 +161,9 @@ public class SeawaterServiceImpl implements SeawaterService { return q; } + + + @Deprecated @Override public List findAllSeawater(String category, String city, String name, String region,Integer room, String root, String sort, Integer startDate, Integer endDate, @@ -209,6 +212,8 @@ public class SeawaterServiceImpl implements SeawaterService { return seawaterDao.findSeawatersCountFromEs(category, city, region, name, alias, regionAlias, startDate, endDate, room, root,table); } + + @Override public Seawater findByIdFromEs(String id,String table) { return seawaterDao.findByIdFromEs(id,table); @@ -218,10 +223,18 @@ public class SeawaterServiceImpl implements SeawaterService { public List findSeawatersFromEs(String category, String city, String region, String name, List alias, List regionAlias, Integer startDate, Integer endDate, Integer room, String root, String sort, boolean order, int start, int limit, String[] keys,String table) { - return seawaterDao.findSeawatersFromEs(category,city,region,name,alias,regionAlias,startDate,endDate,room,root, - sort,order,start,limit,keys,table); + return seawaterDao.findSeawatersFromEs(category,city,region,name,alias,regionAlias,startDate,endDate, null, null, null, null, room,root, + sort,order,start,limit,table); + } + + + @Override + public List findSeawatersFromEs2(String category, String city, String region, String name, List alias, List regionAlias, Integer startDate, Integer endDate, Double startArea, Double endArea, Integer startPrice, Integer endPrice, Integer room, String root, String sort, boolean order, int start, int limit, String[] keys, String table) { + return seawaterDao.findSeawatersFromEs(category,city,region,name,alias,regionAlias,startDate,endDate, startArea, endArea, startPrice, endPrice, room,root, + sort,order,start,limit,table); } + } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/EvaluationRateService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/EvaluationRateService.java index d3b1a35f3..fca7eaba2 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/EvaluationRateService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/EvaluationRateService.java @@ -23,6 +23,8 @@ public interface EvaluationRateService { long evaluation(int districtAvgPrice, Evaluation evaluation); long evaluation(int districtAvgPrice, FjtEvaluation evaluation); + long evaluationRent(double districtSqmetreRent, Evaluation evaluation); + long evaluation(int districtAvgPrice, Evaluation evaluation, boolean min); long evalustionShop(int districtAvgPrice, Evaluation evaluation); @@ -40,7 +42,7 @@ public interface EvaluationRateService { /** * 根据房源ID获得房源当前的估价价格,用于房源信息已经经过知识库匹配 * - * @param houseId + * @param house * @return */ public long evaluation(House house); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/EvaluationRateServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/EvaluationRateServiceImpl.java index 503bdac16..3310cce53 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/EvaluationRateServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/EvaluationRateServiceImpl.java @@ -515,6 +515,198 @@ public class EvaluationRateServiceImpl implements EvaluationRateService { return evaluatePrice; } + private long getEvaluationRatePrice(long evaluatePrice, Evaluation evaluation){ + String type = "小区"; + Map> rateMap = getEvaluationRateMap(); + Map map = rateMap.get(evaluation.getCity()); + if(null == map){ + map = rateMap.get("默认"); + } + + // 楼层系数 + float houseFloorRate = 0; + // 房型 + String roomHall = String.valueOf(evaluation.getRoom()) + "室" + String.valueOf(evaluation.getHall()) + "厅"; + float chamberRate = getEvaluationRate(map, "房型", roomHall, type); + // 朝向系数 + float directionRate = getEvaluationRate(map, "朝向", evaluation.getDirection(), type); + // 小区位置系数 + float insideposRate = getEvaluationRate(map, "小区位置", evaluation.getInsidepos(), type); + // 景观情况系数 + float sightRate = getEvaluationRate(map, "景观", evaluation.getSight(), type); + // 采光通风系数 + float lightingVentilationRate = getEvaluationRate(map, "采光通风", evaluation.getLightingVentilation(), type); + // 噪音影响系数 + float noiseRate = getEvaluationRate(map, "噪音", evaluation.getNoise(), type); + // 边套装置系数 + float sidesetRate = getEvaluationRate(map, "边套", evaluation.getSideset(), type); + // 厌恶设施系数 + float worryFacilityRate = getEvaluationRate(map, "厌恶设施", evaluation.getWorryFacility(), type); + // 车位系数 + float carportRate = getEvaluationRate(map, "车位", evaluation.getCarport(), type); + // 装修系数 + float fitmentRate = getEvaluationRate(map, "装修情况", evaluation.getFitment(), type); + //装修年限系数 + String fitment = ""; + if (null != evaluation.getFitmentAge()) { + if (evaluation.getFitmentAge() <= 3) { + fitment = evaluation.getFitmentAge() + "年"; + } else if (4 == evaluation.getFitmentAge()) { + fitment = evaluation.getFitmentAge() + "年"; + } else { + fitment = "4年以上"; + } + } + float fitmentAgeRate = getEvaluationRate(map, "装修年限", fitment, type); + + // 赠送花园 + float gardenAreaRate = getEvaluationRate(map, "赠送面积因素", "花园", type); + // 赠送地下车库 + float basementAreaRate = getEvaluationRate(map, "赠送面积因素", "地下室", type); + // 赠送露台 + float outerAreaRate = getEvaluationRate(map, "赠送面积因素", "露台", type); + // 赠送阁楼 + float atticAreaRate = getEvaluationRate(map, "赠送面积因素", "阁楼", type); + + // 楼间距 + float floorSpaceRate = getEvaluationRate(map, "楼间距", evaluation.getFloorSpace(), type); + // 政策因素 + float policyRate = getPolicyRate(map); + + + String houseFloorRateType = null; + if (!StringUtils.contains(evaluation.getBuildType(), DistrictKindEnum.bieshu.getValue())) {// 不是别墅 + if (null != evaluation.getHeight() && 0 != evaluation.getHeight() && null != evaluation.getFloor() && 0 != evaluation.getFloor()) { + houseFloorRateType = getHouseFloorRateType(evaluation.getHeight()); + if("小高层".equals(houseFloorRateType) || "高层".equals(houseFloorRateType)){ + if(evaluation.getFloor() == 1 || evaluation.getFloor() == 2){ + houseFloorRate = getFloorRate(map, "小高层", evaluation.getFloor(), "小区"); + }else if(evaluation.getFloor().compareTo(evaluation.getHeight()) == 0){ + houseFloorRate = getFloorRate(map, "小高层", 17, "小区"); + }else{ + if(evaluation.getFloor() == 4){//4楼使用3楼的系数 + houseFloorRate = 0.9545F + 0.108F * ((3 - 1)/(float) (evaluation.getHeight() - 1)); + }else{ + houseFloorRate = 0.9545F + 0.108F * ((evaluation.getFloor() - 1)/(float) (evaluation.getHeight() - 1)); + } + } + if(evaluation.getFloor() == 14){ + houseFloorRate *= 0.99F; + } + evaluatePrice = (long) (evaluatePrice * houseFloorRate); + }else{ + houseFloorRate = getFloorRate(map, houseFloorRateType,(null != evaluation.getFloor() ? evaluation.getFloor() : 0), type); + if(houseFloorRateType.equals("多层")){ + if(houseFloorRate > 0){ + evaluatePrice = (long) (evaluatePrice * houseFloorRate); + } + }else{ + double num; + int mid = evaluation.getHeight()/2; + if(evaluation.getHeight() == evaluation.getFloor()){ + num = 1 + (evaluation.getFloor() - mid -1) * 0.004 -0.001; + }else{ + if(evaluation.getFloor() < mid){ + num = 1- (mid - evaluation.getFloor()) * 0.006; + }else{ + num = 1 + (evaluation.getFloor() - mid) * 0.004; + } + } + evaluatePrice = (long) (evaluatePrice * num * houseFloorRate); + } + } + } + } + + if (chamberRate > 0) { + evaluatePrice = (long) (evaluatePrice * chamberRate); + } + if (directionRate > 0) { + evaluatePrice = (long) (evaluatePrice * directionRate); + } + + if (insideposRate > 0) { + evaluatePrice = (long) (evaluatePrice * insideposRate); + } + + if (sightRate > 0) { + evaluatePrice = (long) (evaluatePrice * sightRate); + } + + if (lightingVentilationRate > 0) { + evaluatePrice = (long) (evaluatePrice * lightingVentilationRate); + } + + if (noiseRate > 0) { + evaluatePrice = (long) (evaluatePrice * noiseRate); + } + + if (sidesetRate > 0) { + evaluatePrice = (long) (evaluatePrice * sidesetRate); + } + + if (worryFacilityRate > 0) { + evaluatePrice = (long) (evaluatePrice * worryFacilityRate); + } + + if (carportRate > 0) { + evaluatePrice = (long) (evaluatePrice * carportRate); + } + + if(StringUtils.isNotBlank(evaluation.getSource()) && !evaluation.getSource().equals("api_property_evaluate_rent")){ + if (null != evaluation.getFitmentAge() && evaluation.getFitmentAge() > 0 && null != evaluation.getFitmentCharge() + && evaluation.getFitmentCharge() > 0) { + // 输入了装修年限和装修价格 + evaluatePrice = (long) (evaluatePrice + evaluation.getFitmentCharge() * fitmentAgeRate); + } + } + if(fitmentRate > 0){ + if(evaluatePrice > 10000000){ + fitmentRate = (float) (fitmentRate + 0.01); + } + + evaluatePrice = (long)(evaluatePrice * fitmentRate); + } + + if (null != evaluation.getGardenArea() && evaluation.getGardenArea() > 0) { + evaluatePrice = (long) ((gardenAreaRate * evaluation.getGardenArea()/evaluation.getArea() + 1) * evaluatePrice); + } + + if (null != evaluation.getBasementArea() && evaluation.getBasementArea() > 0) { + evaluatePrice = (long) ((basementAreaRate * evaluation.getBasementArea()/ evaluation.getArea() + 1) * evaluatePrice); + } + + if (null != evaluation.getAtticArea() && evaluation.getAtticArea() > 0) { + evaluatePrice = (long) ((atticAreaRate * evaluation.getAtticArea()/ evaluation.getArea() + 1) * evaluatePrice); + } + + if (null != evaluation.getTerraceArea() && evaluation.getTerraceArea() > 0) { + evaluatePrice = (long) ((outerAreaRate * evaluation.getTerraceArea()/ evaluation.getArea() + 1) * evaluatePrice); + } + + if (floorSpaceRate > 0) { + evaluatePrice = (long) (floorSpaceRate * evaluatePrice); + } + if (policyRate > 0) { + evaluatePrice = (long) (policyRate * evaluatePrice); + } + if(evaluation.getCarportPrice() !=null){ + evaluatePrice = (long)(evaluatePrice + evaluation.getCarportPrice().intValue()); + } + return evaluatePrice; + } + + + @Override + public long evaluationRent(double districtSqmetreRent, Evaluation evaluation) { + if (districtSqmetreRent < 0 && evaluation != null) { + return 0; + } + long evaluatePrice = (long) (districtSqmetreRent * (null == evaluation.getArea() ? 0 : evaluation.getArea())); + evaluatePrice = getEvaluationRatePrice(evaluatePrice, evaluation); + return evaluatePrice; + } + /** * 实现估价的功能 *