diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java index 4834632c1..1abcab0fa 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java @@ -322,10 +322,10 @@ public class ComprehensiveQueryController { } // 价格下调10% - if (dto.getAvgPrice() != null) { - int avgPrice = new BigDecimal(dto.getAvgPrice()).multiply(new BigDecimal(0.9)).intValue(); - dto.setAvgPrice(avgPrice); - } +// if (dto.getAvgPrice() != null) { +// int avgPrice = new BigDecimal(dto.getAvgPrice()).multiply(new BigDecimal(0.9)).intValue(); +// dto.setAvgPrice(avgPrice); +// } // 非住宅无法估值 // 保存小区均价的返回结果 @@ -354,12 +354,12 @@ public class ComprehensiveQueryController { } // 价格下调10% - Map addressValue = houseValueInformation.getAddressValue(); - if (addressValue != null && addressValue.get("totalPrice") != null && addressValue.get("avgPrice") != null) { - int evaluatePrice = new BigDecimal((Integer) addressValue.get("avgPrice")).multiply(new BigDecimal(0.9)).intValue(); - addressValue.put("avgPrice", evaluatePrice); - addressValue.put("totalPrice", new BigDecimal(evaluatePrice * model.getSize()).intValue()); - } +// Map addressValue = houseValueInformation.getAddressValue(); +// if (addressValue != null && addressValue.get("totalPrice") != null && addressValue.get("avgPrice") != null) { +// int evaluatePrice = new BigDecimal((Integer) addressValue.get("avgPrice")).multiply(new BigDecimal(0.9)).intValue(); +// addressValue.put("avgPrice", evaluatePrice); +// addressValue.put("totalPrice", new BigDecimal(evaluatePrice * model.getSize()).intValue()); +// } // houseValueInformation.setAddressValue(modelAndView); //房源样本 @@ -383,7 +383,7 @@ public class ComprehensiveQueryController { } // 此处慢 long start = System.currentTimeMillis(); - List collaterals = czbankSampleService.findSample2(querys, sampleQuery.getMax()); + List collaterals = czbankSampleService.findSampleForBse(querys, sampleQuery.getMax()); long end = System.currentTimeMillis(); System.out.println("用时:" + (end - start)); Collateral collateral = collaterals.get(0); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleService.java index 4de80fa46..2e648b498 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleService.java @@ -38,4 +38,13 @@ public interface CzbankSampleService { * @return */ List findSample2(List queryBeans, int max); + + /** + * 北交所房源查询 + * + * @param queryBeans + * @param max + * @return + */ + List findSampleForBse(List queryBeans, int max); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java index 25c209e5d..9f6378183 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java @@ -91,6 +91,26 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { return collateralList; } + /** + * 北交所房源查询 + * + * @param queryBeans + * @param max + * @return + */ + @Override + public List findSampleForBse(List queryBeans, int max) { + List collateralList = new ArrayList(); + for (CollateralSampleQueryBean queryBean : queryBeans) { + if (queryBean.getProperty() != null) { + Collateral collateral = findSampleByQueryForBse(queryBean, max); + if (null != collateral) { + collateralList.add(collateral); + } + } + } + return collateralList; + } @Override public List findShopSample(ShopCollateralSampleQueryBean queryBean, int max) { @@ -601,6 +621,100 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { return collateral; } + /** + * 北交所风险缓释 + * + * @param queryBean + * @param max + * @return + */ + private Collateral findSampleByQueryForBse(CollateralSampleQueryBean queryBean, int max) { + + SampleWrapper target = convertQueryBean2Sample(queryBean); + District district = queryBean.getProperty(); + DistrictStat districtStat = districtStatService.findOneDistrictStatsSort(district.getCity(), district.getRegion(), district.getName(), new Date()); + if (districtStat == null) { + districtStat = districtStatService.findOneDistrictStatsSort(district.getCity(), district.getRegion(), district.getName(), DateUtil.add(new Date(), -7)); + } + List keys = new ArrayList(); + List querySamples = new ArrayList(); + String key = district.getName() + "_" + district.getRegion() + "_" + district.getCity(); + // 修改 + keys.add(key); + if (district.getAlias() != null) { + for (String alia : district.getAlias()) { + if (StringUtils.isNotBlank(alia)) { + key = alia + "_" + district.getRegion() + "_" + district.getCity(); + if (!keys.contains(key)) { + keys.add(key); + } + } + } + } + List samples = findBeijiaoShouSampleByDistrict(keys, district.getEstateType2(), queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat, target.getStrctureArea(), 20); + keys.clear(); + sortForSample(samples, target); + SampleWrapper maxSample = null; + SampleWrapper minSample = null; + + querySamples.addAll(samples); + if (querySamples.size() < max) { + // 查询成交补充 TODO + } + for (SampleWrapper sample : querySamples) { + sample.setProperty(queryBean.getProperty()); + if (maxSample == null) { + maxSample = sample; + } else { + if (sample.getUnitPrice() > maxSample.getUnitPrice()) { + maxSample = sample; + } + } + + if (minSample == null) { + minSample = sample; + } else { + if (sample.getUnitPrice() < minSample.getUnitPrice()) { + minSample = sample; + } + } + } + + List selectedSample = new ArrayList(max); + Set priceUniqueKeys = new HashSet(); + for (int i = 0; i < querySamples.size() && selectedSample.size() < max; i++) { + SampleWrapper wrapper = querySamples.get(i); + if (priceUniqueKeys.contains(wrapper.getUnitPrice())) { + continue; + } + priceUniqueKeys.add(wrapper.getUnitPrice()); + selectedSample.add(querySamples.get(i)); + } + fillOthersSimpleInfo(selectedSample); + List sampleList = new ArrayList(selectedSample.size()); + + for (SampleWrapper sampleWrapper : selectedSample) { + Sample sample = new Sample(); + BeanUtils.copyProperties(sampleWrapper, sample); + sampleList.add(sample); + } + + + Collateral collateral = new Collateral(); + collateral.setCltNo(queryBean.getCltNo()); + collateral.setSample(sampleList); + + if (minSample != null) { + collateral.setMinPrice(minSample.getUnitPrice()); + } + + if (maxSample != null) { + collateral.setMaxPrice(maxSample.getUnitPrice()); + } + + return collateral; + } + /** * 创建一个标准样本