+9
@@ -0,0 +1,9 @@
|
|||||||
|
package com.fangjia.dal.mongo.open.dao;
|
||||||
|
|
||||||
|
import com.fangjia.dal.MongoDao;
|
||||||
|
import com.fangjia.dal.mongo.open.model.CommunityBasePrice;
|
||||||
|
import com.fangjia.dal.mongo.open.model.CommunityPoi;
|
||||||
|
|
||||||
|
public interface CommunityBasePriceDao extends MongoDao<CommunityBasePrice> {
|
||||||
|
|
||||||
|
}
|
||||||
+10
@@ -0,0 +1,10 @@
|
|||||||
|
package com.fangjia.dal.mongo.open.dao.impl;
|
||||||
|
|
||||||
|
import com.fangjia.dal.MongoDaoImpl;
|
||||||
|
import com.fangjia.dal.mongo.open.dao.CommunityBasePriceDao;
|
||||||
|
import com.fangjia.dal.mongo.open.dao.CommunityPoiDao;
|
||||||
|
import com.fangjia.dal.mongo.open.model.CommunityBasePrice;
|
||||||
|
import com.fangjia.dal.mongo.open.model.CommunityPoi;
|
||||||
|
|
||||||
|
public class CommunityBasePriceDaoImpl extends MongoDaoImpl<CommunityBasePrice> implements CommunityBasePriceDao {
|
||||||
|
}
|
||||||
+74
@@ -0,0 +1,74 @@
|
|||||||
|
package com.fangjia.dal.mongo.open.model;
|
||||||
|
|
||||||
|
import com.fangjia.dal.MongoEntity;
|
||||||
|
|
||||||
|
import javax.persistence.Column;
|
||||||
|
import javax.persistence.Entity;
|
||||||
|
import javax.persistence.Id;
|
||||||
|
import javax.persistence.Table;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ð¡Çø½¨ÐÐÖÃÐŶÈÐÅÏ¢
|
||||||
|
*
|
||||||
|
* @author shenjian@fangjia.com
|
||||||
|
*/
|
||||||
|
@Entity
|
||||||
|
@Table(name = "business.community_base_price_gj")
|
||||||
|
public class CommunityBasePrice implements MongoEntity {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = -8010010773207622878L;
|
||||||
|
|
||||||
|
private String id;
|
||||||
|
private String city;
|
||||||
|
private String region;
|
||||||
|
private String name;
|
||||||
|
private Double credit;
|
||||||
|
|
||||||
|
@Id
|
||||||
|
@Column(name = "_id")
|
||||||
|
@Override
|
||||||
|
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 = "name")
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Column(name = "credit")
|
||||||
|
public Double getCredit() {
|
||||||
|
return credit;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCredit(Double credit) {
|
||||||
|
this.credit = credit;
|
||||||
|
}
|
||||||
|
}
|
||||||
+71
-6
@@ -31,6 +31,7 @@ import javax.validation.Valid;
|
|||||||
import com.fangjia.core.util.*;
|
import com.fangjia.core.util.*;
|
||||||
import com.fangjia.dal.*;
|
import com.fangjia.dal.*;
|
||||||
import com.fangjia.dal.mongo.model.*;
|
import com.fangjia.dal.mongo.model.*;
|
||||||
|
import com.fangjia.dal.mongo.open.model.CommunityBasePrice;
|
||||||
import com.fangjia.dal.mongo.open.model.CommunityPoi;
|
import com.fangjia.dal.mongo.open.model.CommunityPoi;
|
||||||
import com.fangjia.dal.seawater.dao.SeawaterDao;
|
import com.fangjia.dal.seawater.dao.SeawaterDao;
|
||||||
import com.fangjia.dal.seawater.model.Seawater;
|
import com.fangjia.dal.seawater.model.Seawater;
|
||||||
@@ -177,7 +178,9 @@ public class PropertyController {
|
|||||||
private SeawaterDao seawaterDao;
|
private SeawaterDao seawaterDao;
|
||||||
private SeawaterService seawaterService;
|
private SeawaterService seawaterService;
|
||||||
private SqmetreRentService sqmetreRentService;
|
private SqmetreRentService sqmetreRentService;
|
||||||
private CommunityPoiServiceImpl communityPoiService;
|
private CommunityPoiService communityPoiService;
|
||||||
|
private CommunityBasePriceService communityBasePriceService;
|
||||||
|
private EvaluateFactorService evaluateFactorService;
|
||||||
|
|
||||||
private FileDao fileDao = FileDao.getInstance();
|
private FileDao fileDao = FileDao.getInstance();
|
||||||
private static final int DEFAULT_PAGE_SIZE = 20;
|
private static final int DEFAULT_PAGE_SIZE = 20;
|
||||||
@@ -995,6 +998,32 @@ public class PropertyController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 调整面积不同面积价格
|
||||||
|
try {
|
||||||
|
DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district));
|
||||||
|
int orgAvgPrice = 0;
|
||||||
|
if (districtStatBo != null) {
|
||||||
|
if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("别墅") && districtStatBo.getVillaDistrictStat() != null) {
|
||||||
|
orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvgPrice();
|
||||||
|
} else if (districtStatBo.getDistrictStat() != null) {
|
||||||
|
orgAvgPrice = districtStatBo.getDistrictStat().getAvgPrice();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (evaluation != null && evaluation.getAvgPrice() != null && evaluation.getAvgPrice() > 0) {
|
||||||
|
int factorPrice = evaluation.getAvgPrice();
|
||||||
|
int avgPrice = evaluateFactorService.recompose(district.getCity(), district.getRegion(), evaluation.getArea(), factorPrice, orgAvgPrice);
|
||||||
|
Integer minPrice = (int)(evaluation.getAvgPrice() * 0.95);
|
||||||
|
Integer maxPrice = (int)(evaluation.getAvgPrice() * 1.05);
|
||||||
|
// 偏离度超过5%不进行调整
|
||||||
|
if (minPrice <= avgPrice && avgPrice <= maxPrice) {
|
||||||
|
evaluation.setAvgPrice(avgPrice);
|
||||||
|
evaluation.setBigTotalPrice((long) (avgPrice * evaluation.getArea()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Exception ex) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() != 0
|
if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() != 0
|
||||||
&& (cityPriceCredit == null || evaluation.getCredit() >= cityPriceCredit)) {
|
&& (cityPriceCredit == null || evaluation.getCredit() >= cityPriceCredit)) {
|
||||||
Map<String, Object> districtPriceMap = new HashMap<String, Object>();
|
Map<String, Object> districtPriceMap = new HashMap<String, Object>();
|
||||||
@@ -1165,6 +1194,31 @@ public class PropertyController {
|
|||||||
evaluationService.remove(evaluation.getId());
|
evaluationService.remove(evaluation.getId());
|
||||||
mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价").markNoData());
|
mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的估价").markNoData());
|
||||||
return mav;
|
return mav;
|
||||||
|
}
|
||||||
|
// 调整面积不同面积价格
|
||||||
|
try {
|
||||||
|
DistrictStatBo districtStatBo = districtStatService.findDistrictStat(new DistrictKey(district));
|
||||||
|
int orgAvgPrice = 0;
|
||||||
|
if (districtStatBo != null) {
|
||||||
|
if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("别墅") && districtStatBo.getVillaDistrictStat() != null) {
|
||||||
|
orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvgPrice();
|
||||||
|
} else if (districtStatBo.getDistrictStat() != null) {
|
||||||
|
orgAvgPrice = districtStatBo.getDistrictStat().getAvgPrice();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (evaluation != null && evaluation.getAvgPrice() != null && evaluation.getAvgPrice() > 0) {
|
||||||
|
int factorPrice = evaluation.getAvgPrice();
|
||||||
|
int avgPrice = evaluateFactorService.recompose(district.getCity(), district.getRegion(), evaluation.getArea(), factorPrice, orgAvgPrice);
|
||||||
|
Integer minPrice = (int)(evaluation.getAvgPrice() * 0.95);
|
||||||
|
Integer maxPrice = (int)(evaluation.getAvgPrice() * 1.05);
|
||||||
|
// 偏离度超过5%不进行调整
|
||||||
|
if (minPrice <= avgPrice && avgPrice <= maxPrice) {
|
||||||
|
evaluation.setAvgPrice(avgPrice);
|
||||||
|
evaluation.setBigTotalPrice((long) (avgPrice * evaluation.getArea()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Exception ex) {
|
||||||
|
|
||||||
}
|
}
|
||||||
Map<String, Object> districtPriceMap = new LinkedHashMap<String, Object>();
|
Map<String, Object> districtPriceMap = new LinkedHashMap<String, Object>();
|
||||||
districtPriceMap.put("city", district.getCity());
|
districtPriceMap.put("city", district.getCity());
|
||||||
@@ -1179,6 +1233,13 @@ public class PropertyController {
|
|||||||
// }
|
// }
|
||||||
districtPriceMap.put("totalPrice", evaluation.getBigTotalPrice());
|
districtPriceMap.put("totalPrice", evaluation.getBigTotalPrice());
|
||||||
districtPriceMap.put("unitPrice", evaluation.getAvgPrice());
|
districtPriceMap.put("unitPrice", evaluation.getAvgPrice());
|
||||||
|
// 新增置信度
|
||||||
|
CommunityBasePrice communityBasePrice = communityBasePriceService.getById(district.getId());
|
||||||
|
if (communityBasePrice != null) {
|
||||||
|
districtPriceMap.put("credit", communityBasePrice.getCredit());
|
||||||
|
} else {
|
||||||
|
districtPriceMap.put("credit", evaluation.getCredit());
|
||||||
|
}
|
||||||
List<String> names = new ArrayList<String>();
|
List<String> names = new ArrayList<String>();
|
||||||
names.add(district.getName());
|
names.add(district.getName());
|
||||||
if(district.getAlias() != null){
|
if(district.getAlias() != null){
|
||||||
@@ -5650,11 +5711,15 @@ public class PropertyController {
|
|||||||
this.rentDealPriceService = rentDealPriceService;
|
this.rentDealPriceService = rentDealPriceService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CommunityPoiServiceImpl getCommunityPoiService() {
|
public void setCommunityPoiService(CommunityPoiService communityPoiService) {
|
||||||
return communityPoiService;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCommunityPoiService(CommunityPoiServiceImpl communityPoiService) {
|
|
||||||
this.communityPoiService = communityPoiService;
|
this.communityPoiService = communityPoiService;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setEvaluateFactorService(EvaluateFactorService evaluateFactorService) {
|
||||||
|
this.evaluateFactorService = evaluateFactorService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCommunityBasePriceService(CommunityBasePriceService communityBasePriceService) {
|
||||||
|
this.communityBasePriceService = communityBasePriceService;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+9
@@ -0,0 +1,9 @@
|
|||||||
|
package com.fangjia.service.open;
|
||||||
|
|
||||||
|
import com.fangjia.dal.mongo.open.model.CommunityBasePrice;
|
||||||
|
import com.fangjia.dal.mongo.open.model.CommunityPoi;
|
||||||
|
|
||||||
|
public interface CommunityBasePriceService {
|
||||||
|
|
||||||
|
CommunityBasePrice getById(String id);
|
||||||
|
}
|
||||||
+22
@@ -0,0 +1,22 @@
|
|||||||
|
package com.fangjia.service.open.impl;
|
||||||
|
|
||||||
|
import com.fangjia.dal.mongo.open.dao.CommunityBasePriceDao;
|
||||||
|
import com.fangjia.dal.mongo.open.dao.CommunityPoiDao;
|
||||||
|
import com.fangjia.dal.mongo.open.model.CommunityBasePrice;
|
||||||
|
import com.fangjia.dal.mongo.open.model.CommunityPoi;
|
||||||
|
import com.fangjia.service.open.CommunityBasePriceService;
|
||||||
|
import com.fangjia.service.open.CommunityPoiService;
|
||||||
|
|
||||||
|
public class CommunityBasePriceServiceImpl implements CommunityBasePriceService {
|
||||||
|
|
||||||
|
private CommunityBasePriceDao communityBasePriceDao;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CommunityBasePrice getById(String id) {
|
||||||
|
return communityBasePriceDao.findById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCommunityBasePriceDao(CommunityBasePriceDao communityBasePriceDao) {
|
||||||
|
this.communityBasePriceDao = communityBasePriceDao;
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user