From db495f649623f794f183ed2a69fe867dcc69466d Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Thu, 15 Jan 2026 11:12:26 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=8C=B9=E9=85=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/PropertyController.java | 68 +++---------------- 1 file changed, 10 insertions(+), 58 deletions(-) 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 e434610fe..c6e1862bb 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 @@ -6007,47 +6007,6 @@ public class PropertyController { } District district = null; - if(StringUtils.isNotBlank(model.getCity()) && StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())){ - /* 先到CPDB库中查找小区 */ - district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), - "district"); - } - boolean villaFlag = DataUtil.isVilla(model.getSize(), model.getName(), model.getHeight(), model.getRoom()); - -// Map params = new HashMap(); -// params.put("city", model.getCity()); -// if (StringUtils.isNotBlank(model.getDistrict())) { -// params.put("suggestDistrict", model.getDistrict()); -// } -// params.put("address", model.getAddress()); -// if (StringUtils.isNotBlank(model.getName())) { -// params.put("suggestName", model.getName()); -// } -// params.put("category", "district"); -// params.put("propertyType", model.getPropertyType()); -// String result = addressMatchProxyService.parser(params); -// if (result != null) { -// JSONObject json = JSONObject.fromObject(result); -// if (json.getInt("code") == 200) { -// Map map = (Map) json.get("result"); -// if ((Integer) map.get("precise") >= 0) { -// String propertyType = (String) map.get("propertyType"); -// // 优先使用客户的物业类型,即使面积很大也不进行别墅推断 20241111 -// String userPropertyTypeParam = model.getPropertyType(); -// if (StringUtils.isNotBlank(userPropertyTypeParam) && ("0,2".contains(userPropertyTypeParam))) { -// villaFlag = false; -// } -// if (villaFlag && StringUtils.isNotBlank(propertyType) && !propertyType.equals("别墅")) { -// district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name") + "别墅", "district"); -// } -// if (null == district) { -// district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name"), "district"); -// } -// -// } -// } -// } - String estateType = null; if(StringUtils.isNotBlank(model.getPropertyType())){ if(model.getPropertyType().equals("0")){ @@ -6059,6 +6018,10 @@ public class PropertyController { } } + if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())){ + district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); + } + if (district == null && (StringUtils.isNotBlank(model.getName()) || StringUtils.isNotBlank(model.getAddress()))) { JSONObject resultObject = null; if(StringUtils.isNotBlank(model.getAddress())){ @@ -6077,16 +6040,10 @@ public class PropertyController { district = districtService.findById(id); } } -// if (district == null) { -// //使用新匹配再配一遍,不加类型,有结果,类型为district则走小区估值,其它类型也走经纬度估值 -// JSONObject resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), null, false); -// if (resultObject != null && resultObject.containsKey("category") && resultObject.get("category")!=null) { -// if(resultObject.containsKey("id") && resultObject.get("category").equals("district")){ -// String id = (String) resultObject.get("id"); -// district = districtService.findById(id); -// } -// } -// } + if(district == null){ + mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的租金估价").markNoData()); + return mav; + } if(district != null){ model.setRegion(district.getRegion()); @@ -6175,6 +6132,7 @@ public class PropertyController { return mav; } + District district = null; String estateType = null; if(StringUtils.isNotBlank(model.getPropertyType())){ if(model.getPropertyType().equals("0")){ @@ -6186,14 +6144,8 @@ public class PropertyController { } } - District district = null; - if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())){ - if(StringUtils.isNotBlank(model.getEstateType()) && model.getEstateType().equals("别墅") && !model.getName().contains("别墅")){ - district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName()+"别墅","district"); - }else{ - district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); - } + district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); } if (district == null && (StringUtils.isNotBlank(model.getName()) || StringUtils.isNotBlank(model.getAddress()))) { From 48e3e71ff74a812aacf7958de07be184a4adb835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Thu, 15 Jan 2026 11:14:33 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=94=BE=E5=A4=A7=E6=A0=B7=E6=9C=AC?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/service/datastore/OfficeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java index a2d523b7c..a10b567c2 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java @@ -207,7 +207,7 @@ public class OfficeServiceImpl implements OfficeService { sortParams.add(new SortParam("date", false)); // 第二步:基准价*楼层系数*装修系数*朝向系数 - OfficeRentStat officeRentStat = officeRentStatDao.findFirstByParams(params); + OfficeRentStat officeRentStat = officeRentStatDao.findFirstByParams(params, sortParams); // if(officeRentStat == null){ // // 获取上个月yyyyMM日期 // String date = DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -1), "yyyyMM"); From ca520bbfa172622c84a69eec136c1da23c5f5f6e Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 16 Jan 2026 10:45:38 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A1=88=E4=BE=8B?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E7=B3=BB=E6=95=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/CommercialController.java | 57 +++++++++--- .../open/controllers/OfficeController.java | 46 ++++++++-- .../controllers/OfficeSellController.java | 46 ++++++++-- .../open/controllers/PropertyController.java | 89 +++++++++++++++---- 4 files changed, 194 insertions(+), 44 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index db77ba917..c50cb759e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -40,6 +40,7 @@ public class CommercialController { return mav; } + Double ratio = getUserPriceRatio(request); JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPSELL_EVALUATE); if (json != null) { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { @@ -51,7 +52,7 @@ public class CommercialController { resultMap.put("totalPrice", totalPrice); if (model.getShowSample()!=null && model.getShowSample()==1 && json.containsKey("case")) { - List dtos = createBusiness((JSONArray) json.get("case"), "sell"); + List dtos = createBusiness((JSONArray) json.get("case"), "sell", ratio); resultMap.put("result", dtos); } @@ -66,7 +67,7 @@ public class CommercialController { return mav; } - public Object shopSellSampleAction(CommercialModel model) { + public Object shopSellSampleAction(CommercialModel model, HttpServletRequest request) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); @@ -74,12 +75,13 @@ public class CommercialController { if(mav.model()!=null){ return mav; } + Double ratio = getUserPriceRatio(request); JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPSELL_EVALUATE); if (json != null) { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { List> list = new ArrayList>(); if (json.containsKey("case")) { - List dtos = createBusiness((JSONArray) json.get("case"), "sell"); + List dtos = createBusiness((JSONArray) json.get("case"), "sell", ratio); mav.setModel(BasicModel.buildOKModel().setResult(dtos)); if(dtos.size()<5){ BasicModel.markNoDataRequest(); @@ -110,6 +112,7 @@ public class CommercialController { return mav; } + Double ratio = getUserPriceRatio(request); JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPRENT_EVALUATE); if (json != null) { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { @@ -122,7 +125,7 @@ public class CommercialController { if (model.getShowSample()!=null && model.getShowSample()==1 && json.containsKey("case")) { - List dtos = createBusiness((JSONArray) json.get("case"), "rent"); + List dtos = createBusiness((JSONArray) json.get("case"), "rent", ratio); resultMap.put("result", dtos); } @@ -154,7 +157,7 @@ public class CommercialController { return totalPrice; } - private List createBusiness(JSONArray cases, String cat){ + private List createBusiness(JSONArray cases, String cat, Double ratio){ if(cases != null && cases.size()>0){ List dtos = new ArrayList(); for(int i=0 ;i < cases.size(); i++){ @@ -164,14 +167,28 @@ public class CommercialController { dto.setDistrict(jsonObject.getString("district")); dto.setName(jsonObject.getString("name")); dto.setLocation(jsonObject.getString("location")); - if(cat.equals("rent")){ - Double dayPrice = jsonObject.getInt("totalPrice")/(jsonObject.getDouble("size")*30); - dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + + if(ratio != null){ + Integer totalPrice = new BigDecimal(jsonObject.getInt("totalPrice")* ratio).setScale(0, BigDecimal.ROUND_HALF_UP).intValue(); + if(cat.equals("rent")){ + Double dayPrice = totalPrice/(jsonObject.getDouble("size")*30); + dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + }else{ + Integer avgPrie = (int)(totalPrice/jsonObject.getDouble("size")); + dto.setUnitPrice(avgPrie); + } + dto.setTotalPrice(totalPrice); }else{ - dto.setUnitPrice(jsonObject.getInt("unitPrice")); + if(cat.equals("rent")){ + Double dayPrice = jsonObject.getInt("totalPrice")/(jsonObject.getDouble("size")*30); + dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + }else{ + dto.setUnitPrice(jsonObject.getInt("unitPrice")); + } + dto.setTotalPrice(jsonObject.getInt("totalPrice")); } - dto.setTotalPrice(jsonObject.getInt("totalPrice")); + dto.setDistance(jsonObject.getInt("distance")); dto.setSize(jsonObject.getDouble("size")); @@ -191,7 +208,7 @@ public class CommercialController { } - public Object shopRentSampleAction(CommercialModel model) { + public Object shopRentSampleAction(CommercialModel model, HttpServletRequest request) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); @@ -199,12 +216,13 @@ public class CommercialController { if(mav.model()!=null){ return mav; } + Double ratio = getUserPriceRatio(request); JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPRENT_EVALUATE); if (json != null) { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { List> list = new ArrayList>(); if (json.containsKey("case")) { - List dtos = createBusiness((JSONArray) json.get("case"), "rent"); + List dtos = createBusiness((JSONArray) json.get("case"), "rent", ratio); mav.setModel(BasicModel.buildOKModel().setResult(dtos)); if(dtos.size()<5){ BasicModel.markNoDataRequest(); @@ -334,6 +352,21 @@ public class CommercialController { return json; } + private Double getUserPriceRatio(HttpServletRequest request){ + Double ratio = null; + AuthenticationBean authenticationBean = (AuthenticationBean) request + .getAttribute(AuthenticationBean.ATTR_AUTHENTICATION_BEAN); + if (authenticationBean != null && authenticationBean.apiUser != null) { + String userId = String.valueOf(authenticationBean.apiUser.getId()); + ApiUserCfg apiUserCfg = apiUserCfgService.findByUserId(Long.valueOf(userId), ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); + if(apiUserCfg != null && apiUserCfg.getCfgValue() != null && apiUserCfg.getCfgValue() instanceof Double){ + Double rate = (Double)apiUserCfg.getCfgValue(); + ratio = rate; + } + } + return ratio; + } + public void setApiUserCfgService(ApiUserCfgService apiUserCfgService) { this.apiUserCfgService = apiUserCfgService; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java index 10f8faba0..dd3b08d49 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java @@ -727,6 +727,7 @@ public class OfficeController { } /* 先到CPDB库中查找写字楼 */ District district = null; + Double ratio = getUserPriceRatio(request); if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())) { district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "office"); @@ -774,7 +775,7 @@ public class OfficeController { if (evaluation.getUnitPrice() != null && evaluation.getUnitPrice() != 0) { Map districtPriceMap = new HashMap(); - List createBusiness = createBusiness(evaluation.getSeawater(), "office_rent", district); + List createBusiness = createBusiness(evaluation.getSeawater(), "office_rent", district, ratio); mav.setModel(BasicModel.buildOKModel().setResult(createBusiness)); if(createBusiness.size()<5){ BasicModel.markNoDataRequest(); @@ -799,6 +800,23 @@ public class OfficeController { return null; } + + private Double getUserPriceRatio(HttpServletRequest request){ + Double ratio = null; + AuthenticationBean authenticationBean = (AuthenticationBean) request + .getAttribute(AuthenticationBean.ATTR_AUTHENTICATION_BEAN); + if (authenticationBean != null && authenticationBean.apiUser != null) { + String userId = String.valueOf(authenticationBean.apiUser.getId()); + ApiUserCfg apiUserCfg = apiUserCfgService.findByUserId(Long.valueOf(userId), ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); + if(apiUserCfg != null && apiUserCfg.getCfgValue() != null && apiUserCfg.getCfgValue() instanceof Double){ + Double rate = (Double)apiUserCfg.getCfgValue(); + ratio = rate; + } + } + return ratio; + } + + /** * 通过EvaluationModel组装Evaluation实体 * @@ -967,7 +985,7 @@ public class OfficeController { } }; - private List createBusiness(List seawaterDtos, String cat, District district){ + private List createBusiness(List seawaterDtos, String cat, District district, Double ratio){ if(seawaterDtos != null && seawaterDtos.size()>0){ List dtos = new ArrayList(); for(SeawaterDto house : seawaterDtos){ @@ -976,16 +994,30 @@ public class OfficeController { dto.setDistrict(house.getDistrict()); dto.setName(house.getName()); dto.setLocation(house.getLocation()); - if(cat.equals("office_rent")){ - Double dayPrice = house.getTotalPrice()/(house.getArea()*30); - dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + if(ratio != null) { + Integer totalPrice = (int) (house.getTotalPrice() * ratio); + if(cat.equals("office_rent")){ + Double dayPrice = totalPrice/(house.getArea()*30); + dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + }else{ + Integer avgPrie = (int)(totalPrice/house.getArea()); + dto.setUnitPrice(avgPrie); + } + dto.setTotalPrice(totalPrice); }else{ - dto.setUnitPrice(house.getUnitPrice()); + if(cat.equals("office_rent")){ + Double dayPrice = house.getTotalPrice()/(house.getArea()*30); + dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + }else{ + dto.setUnitPrice(house.getUnitPrice()); + } + dto.setTotalPrice(house.getTotalPrice()); } + if(StringUtils.isNotBlank(house.getEstateType())){ dto.setType(house.getEstateType()); } - dto.setTotalPrice(house.getTotalPrice()); + if(StringUtils.isNotBlank(house.getLocation()) && district.getLat()!=null){ String[] arrs = house.getLocation().split(","); double distance = GeoUtils.calculateDistance(district.getLng()/10000000000.0, district.getLat()/10000000000.0, Double.valueOf(arrs[0]), Double.valueOf(arrs[1])); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java index 8a6d00e14..fefd8c28c 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java @@ -440,6 +440,7 @@ public class OfficeSellController { return mav; } + Double ratio = getUserPriceRatio(request); /* 先到CPDB库中查找写字楼 */ District district = null; @@ -490,7 +491,7 @@ public class OfficeSellController { OfficeEvaluationDto evaluation = officeService.evaluateSell(district, buildEvaluation(model, request)); if (evaluation.getUnitPrice() != null && evaluation.getUnitPrice() != 0) { Map districtPriceMap = new HashMap(); - List createBusiness = createBusiness(evaluation.getSeawater(), "office_sell", district); + List createBusiness = createBusiness(evaluation.getSeawater(), "office_sell", district, ratio); // districtPriceMap.put("result", createBusiness); mav.setModel(BasicModel.buildOKModel().setResult(createBusiness)); if(createBusiness.size()<5){ @@ -673,7 +674,7 @@ public class OfficeSellController { } - private List createBusiness(List seawaterDtos, String cat, District district){ + private List createBusiness(List seawaterDtos, String cat, District district, Double ratio){ if(seawaterDtos != null && seawaterDtos.size()>0){ List dtos = new ArrayList(); for(SeawaterDto house : seawaterDtos){ @@ -682,16 +683,31 @@ public class OfficeSellController { dto.setDistrict(house.getDistrict()); dto.setName(house.getName()); dto.setLocation(house.getLocation()); - if(cat.equals("office_rent")){ - Double dayPrice = house.getTotalPrice()/(house.getUnitPrice()*30); - dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + if(ratio != null){ + Integer totalPrice = (int) (house.getTotalPrice()*ratio); + if(cat.equals("office_rent")){ + Double dayPrice = totalPrice/(house.getArea()*30); + dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + }else{ + Integer avgPrie = (int)(totalPrice/house.getArea()); + dto.setUnitPrice(avgPrie); + } + dto.setTotalPrice(totalPrice); }else{ - dto.setUnitPrice(house.getUnitPrice()); + if(cat.equals("office_rent")){ + Double dayPrice = house.getTotalPrice()/(house.getArea()*30); + dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + }else{ + dto.setUnitPrice(house.getUnitPrice()); + } + dto.setTotalPrice(house.getTotalPrice()); + } + if(StringUtils.isNotBlank(house.getEstateType())){ dto.setType(house.getEstateType()); } - dto.setTotalPrice(house.getTotalPrice()); + if(StringUtils.isNotBlank(house.getLocation()) && district.getLat()!=null){ String[] arrs = house.getLocation().split(","); double distance = GeoUtils.calculateDistance(district.getLng()/10000000000.0, district.getLat()/10000000000.0, Double.valueOf(arrs[0]), Double.valueOf(arrs[1])); @@ -714,6 +730,22 @@ public class OfficeSellController { return null; } + + private Double getUserPriceRatio(HttpServletRequest request){ + Double ratio = null; + AuthenticationBean authenticationBean = (AuthenticationBean) request + .getAttribute(AuthenticationBean.ATTR_AUTHENTICATION_BEAN); + if (authenticationBean != null && authenticationBean.apiUser != null) { + String userId = String.valueOf(authenticationBean.apiUser.getId()); + ApiUserCfg apiUserCfg = apiUserCfgService.findByUserId(Long.valueOf(userId), ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); + if(apiUserCfg != null && apiUserCfg.getCfgValue() != null && apiUserCfg.getCfgValue() instanceof Double){ + Double rate = (Double)apiUserCfg.getCfgValue(); + ratio = rate; + } + } + return ratio; + } + public void setOfficeService(OfficeService officeService) { this.officeService = officeService; } 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 c6e1862bb..68c9cb515 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 @@ -1744,8 +1744,10 @@ public class PropertyController { json = httpRequest.getJsonContent("http://192.168.0.100:30020/avmWeb/avmAnn", param, "UTF-8"); if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { HashMap resultMap = new HashMap(); - resultMap.put("avgPrice", Long.valueOf(json.getString("unitPrice"))); - resultMap.put("totalPrice", Long.valueOf(json.getString("totalPrice"))); + Long totalPrice = getRatioPrice(request, Long.valueOf(json.getString("totalPrice"))); + + resultMap.put("avgPrice", new BigDecimal(totalPrice/model.getSize()).setScale(0, BigDecimal.ROUND_HALF_UP).longValue()); + resultMap.put("totalPrice", totalPrice); mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); } else { mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); @@ -1770,6 +1772,41 @@ public class PropertyController { } + + private Long getRatioPrice(HttpServletRequest request, Long totalPrice){ + AuthenticationBean authenticationBean = (AuthenticationBean) request + .getAttribute(AuthenticationBean.ATTR_AUTHENTICATION_BEAN); + if (authenticationBean != null && authenticationBean.apiUser != null) { + String userId = String.valueOf(authenticationBean.apiUser.getId()); + ApiUserCfg apiUserCfg = apiUserCfgService.findByUserId(Long.valueOf(userId), ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); + if(apiUserCfg != null && apiUserCfg.getCfgValue() != null && apiUserCfg.getCfgValue() instanceof Double){ + Double rate = (Double)apiUserCfg.getCfgValue(); + if(rate != 0){ + totalPrice = (long)(totalPrice * rate); + } + } + } + + return totalPrice; + } + + + private Double getUserPriceRatio(HttpServletRequest request){ + Double ratio = null; + AuthenticationBean authenticationBean = (AuthenticationBean) request + .getAttribute(AuthenticationBean.ATTR_AUTHENTICATION_BEAN); + if (authenticationBean != null && authenticationBean.apiUser != null) { + String userId = String.valueOf(authenticationBean.apiUser.getId()); + ApiUserCfg apiUserCfg = apiUserCfgService.findByUserId(Long.valueOf(userId), ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); + if(apiUserCfg != null && apiUserCfg.getCfgValue() != null && apiUserCfg.getCfgValue() instanceof Double){ + Double rate = (Double)apiUserCfg.getCfgValue(); + ratio = rate; + } + } + return ratio; + } + + public Object evaluate2Action(PropertyEvaluationModel model, HttpServletRequest request) throws NumberFormatException, IllegalAccessException { RestfulModelAndView mav = new RestfulModelAndView(); @@ -6195,6 +6232,7 @@ public class PropertyController { model.setRadius(1000); } + Double ratio = getUserPriceRatio(request); if(district != null){ if(model.getMinPrice() == null){ @@ -6232,7 +6270,7 @@ public class PropertyController { //查自身样本 List houseSelf = houseService.findSelfHouseByParams(district, "sell", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager); if(houseSelf!=null && houseSelf.size()>0){ - caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource()); + caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource(), ratio); for(HouseCaseDto house : caseDtos){ house.setDistance(0); } @@ -6251,7 +6289,7 @@ public class PropertyController { newDist.setEstateType2(estateType); houseSelf = houseService.findSelfHouseByParams(newDist, "sell", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager); if(houseSelf!=null && houseSelf.size()>0){ - caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource()); + caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource(), ratio); if(caseDtos.size() == pager.getPageSize()){ caseDtos = caseDtos.subList(0, caseDtos.size()-1); mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); @@ -6268,7 +6306,7 @@ public class PropertyController { newDist.setEstateType2(estateType); houseSelf = houseService.findSelfHouseByParams(newDist, "sell", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), null, pager); if(houseSelf!=null && houseSelf.size()>0){ - caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource()); + caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource(), ratio); if(caseDtos.size() == pager.getPageSize()){ caseDtos = caseDtos.subList(0, caseDtos.size()-1); mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); @@ -6333,7 +6371,7 @@ public class PropertyController { houseAround = houseService.findArroundHouseByParams("sell", lng, lat, Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager, model.getRadius()); } if(houseAround != null && houseAround.size()>0){ - caseDtos = createHouseCase(caseDtos, houseAround, model.getShowSource()); + caseDtos = createHouseCase(caseDtos, houseAround, model.getShowSource(), ratio); } } if(caseDtos.size()>pager.getPageSize()){ @@ -6423,6 +6461,7 @@ public class PropertyController { model.setRadius(1000); } + Double ratio = getUserPriceRatio(request); if(district != null){ if(model.getMinPrice() == null){ @@ -6444,12 +6483,11 @@ public class PropertyController { } } - if(caseDtos.size() < pager.getPageSize()){ //查自身样本 List houseSelf = houseService.findSelfHouseByParams(district, "rent", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager); if(houseSelf!=null && houseSelf.size()>0){ - caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource()); + caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource(), ratio); for(HouseCaseDto house : caseDtos){ house.setDistance(0); } @@ -6468,7 +6506,7 @@ public class PropertyController { newDist.setEstateType2(estateType); houseSelf = houseService.findSelfHouseByParams(newDist, "rent", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager); if(houseSelf!=null && houseSelf.size()>0){ - caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource()); + caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource(), ratio); if(caseDtos.size() == pager.getPageSize()){ caseDtos = caseDtos.subList(0, caseDtos.size()-1); mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); @@ -6487,7 +6525,7 @@ public class PropertyController { newDist.setEstateType2(estateType); houseSelf = houseService.findSelfHouseByParams(newDist, "rent", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), null, pager); if(houseSelf!=null && houseSelf.size()>0){ - caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource()); + caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource(), ratio); if(caseDtos.size() == pager.getPageSize()){ caseDtos = caseDtos.subList(0, caseDtos.size()-1); mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); @@ -6529,7 +6567,7 @@ public class PropertyController { houseAround = houseService.findArroundHouseByParams("rent", lng, lat, Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager, model.getRadius()); } if(houseAround != null && houseAround.size()>0){ - caseDtos = createHouseCase(caseDtos, houseAround, model.getShowSource()); + caseDtos = createHouseCase(caseDtos, houseAround, model.getShowSource(), ratio); } } if(caseDtos.size()>pager.getPageSize()){ @@ -6580,7 +6618,7 @@ public class PropertyController { } - private List createHouseCase(List caseDtos, List houses, Integer showSource){ + private List createHouseCase(List caseDtos, List houses, Integer showSource, Double ratio){ if (houses != null && !houses.isEmpty()) { Set seenIds = new HashSet(); Iterator iterator = houses.iterator(); @@ -6604,13 +6642,28 @@ public class PropertyController { caseDto.setDistrict(house.getRegion()); caseDto.setName(house.getDistrictName()); caseDto.setSize(house.getArea() == null || house.getArea() == 0 ? null : house.getArea()); - if(house.getCategory().equals("sell")){ - caseDto.setUnitPrice(house.getAvgPrice() == null || house.getAvgPrice() == 0 ? null : house.getAvgPrice()); - }else if(house.getCategory().equals("rent")){ - Double dayPrice = house.getTotalPrice()/(30*house.getArea()); - caseDto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + + if(house.getTotalPrice()!=null){ + if(ratio!=null){ + Integer totalPrice = new BigDecimal(house.getTotalPrice() * ratio).setScale(0, BigDecimal.ROUND_HALF_UP).intValue(); + caseDto.setTotalPrice(totalPrice); + if(house.getCategory().equals("sell")){ + caseDto.setUnitPrice(new BigDecimal(totalPrice/house.getArea()).setScale(0, BigDecimal.ROUND_HALF_UP).intValue()); + }else if(house.getCategory().equals("rent")){ +// Double dayPrice = house.getTotalPrice()/(30*house.getArea()); + Double dayPrice = totalPrice/(30*house.getArea()); + caseDto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + } + }else{ + caseDto.setTotalPrice(house.getTotalPrice() == null || house.getTotalPrice() == 0 ? null : house.getTotalPrice()); + if(house.getCategory().equals("sell")){ + caseDto.setUnitPrice(house.getAvgPrice() == null || house.getAvgPrice() == 0 ? null : house.getAvgPrice()); + }else if(house.getCategory().equals("rent")){ + Double dayPrice = house.getTotalPrice()/(30*house.getArea()); + caseDto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + } + } } - caseDto.setTotalPrice(house.getTotalPrice() == null || house.getTotalPrice() == 0 ? null : house.getTotalPrice()); caseDto.setDirection(house.getDirection()); caseDto.setDecoration(house.getFitment()); caseDto.setFloor(house.getFloor() == null || house.getFloor() == 0 ? null : house.getFloor()); From 660340451060c178ce69b047b42d145f1148803f Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 16 Jan 2026 16:37:30 +0800 Subject: [PATCH 04/14] =?UTF-8?q?null=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/CommercialController.java | 4 ++-- .../java/com/fangjia/open/controllers/OfficeController.java | 4 ++-- .../com/fangjia/open/controllers/OfficeSellController.java | 4 ++-- .../java/com/fangjia/open/controllers/PropertyController.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index c50cb759e..3b64243d8 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -83,7 +83,7 @@ public class CommercialController { if (json.containsKey("case")) { List dtos = createBusiness((JSONArray) json.get("case"), "sell", ratio); mav.setModel(BasicModel.buildOKModel().setResult(dtos)); - if(dtos.size()<5){ + if(dtos!=null && dtos.size()<5){ BasicModel.markNoDataRequest(); } } @@ -224,7 +224,7 @@ public class CommercialController { if (json.containsKey("case")) { List dtos = createBusiness((JSONArray) json.get("case"), "rent", ratio); mav.setModel(BasicModel.buildOKModel().setResult(dtos)); - if(dtos.size()<5){ + if(dtos!=null && dtos.size()<5){ BasicModel.markNoDataRequest(); } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java index dd3b08d49..68a0fca8f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java @@ -777,12 +777,12 @@ public class OfficeController { Map districtPriceMap = new HashMap(); List createBusiness = createBusiness(evaluation.getSeawater(), "office_rent", district, ratio); mav.setModel(BasicModel.buildOKModel().setResult(createBusiness)); - if(createBusiness.size()<5){ + if(createBusiness!=null && createBusiness.size()<5){ BasicModel.markNoDataRequest(); } return mav; } - mav.setModel(BasicModel.buildOKModel().markNoData()); +// mav.setModel(BasicModel.buildOKModel().markNoData()); return mav; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java index fefd8c28c..e96f24d70 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java @@ -494,12 +494,12 @@ public class OfficeSellController { List createBusiness = createBusiness(evaluation.getSeawater(), "office_sell", district, ratio); // districtPriceMap.put("result", createBusiness); mav.setModel(BasicModel.buildOKModel().setResult(createBusiness)); - if(createBusiness.size()<5){ + if(createBusiness !=null && createBusiness.size()<5){ BasicModel.markNoDataRequest(); } return mav; } - mav.setModel(BasicModel.buildOKModel().markNoData()); +// mav.setModel(BasicModel.buildOKModel().markNoData()); return mav; } 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 68c9cb515..f3e7ea974 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 @@ -6378,7 +6378,7 @@ public class PropertyController { caseDtos = caseDtos.subList(0, caseDtos.size()-1); } mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); - if(caseDtos.size()<5){ + if(caseDtos!=null && caseDtos.size()<5){ BasicModel.markNoDataRequest(); } return mav; @@ -6574,7 +6574,7 @@ public class PropertyController { caseDtos = caseDtos.subList(0, caseDtos.size()-1); } mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); - if(caseDtos.size()<5){ + if(caseDtos!=null && caseDtos.size()<5){ BasicModel.markNoDataRequest(); } return mav; From 531a9d9c2379548c7d5267229d173c3ec7e89808 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Wed, 28 Jan 2026 11:14:15 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B9=96=E5=8C=97?= =?UTF-8?q?=E5=BE=81=E4=BF=A1=E5=AE=9A=E5=88=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mongo/dao/bkoff/DealSampleDao.java | 8 + .../mongo/dao/bkoff/DealSampleDaoImpl.java | 9 + .../dal/mongo/model/bkoff/DealSample.java | 194 ++++++++++++++++ .../controllers/CommercialController.java | 5 + .../open/controllers/OfficeController.java | 190 ++++++++++++++++ .../controllers/OfficeSellController.java | 215 ++++++++++++++++++ .../open/controllers/PropertyController.java | 208 ++++++++++++++++- .../mongo/fangjia/DealSampleService.java | 10 + .../mongo/fangjia/DealSampleServiceImpl.java | 62 +++++ 9 files changed, 895 insertions(+), 6 deletions(-) create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/DealSampleDao.java create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/DealSampleDaoImpl.java create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealSample.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleService.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleServiceImpl.java diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/DealSampleDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/DealSampleDao.java new file mode 100644 index 000000000..825e58d15 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/DealSampleDao.java @@ -0,0 +1,8 @@ +package com.fangjia.dal.mongo.dao.bkoff; + + +import com.fangjia.dal.MongoDao; +import com.fangjia.dal.mongo.model.bkoff.DealSample; + +public interface DealSampleDao extends MongoDao { +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/DealSampleDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/DealSampleDaoImpl.java new file mode 100644 index 000000000..3013c3cf5 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/DealSampleDaoImpl.java @@ -0,0 +1,9 @@ +package com.fangjia.dal.mongo.dao.bkoff; + +import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.mongo.model.bkoff.DealSample; + + +public class DealSampleDaoImpl extends MongoDaoImpl implements DealSampleDao{ + +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealSample.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealSample.java new file mode 100644 index 000000000..c1e210ed4 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealSample.java @@ -0,0 +1,194 @@ +package com.fangjia.dal.mongo.model.bkoff; + +import com.fangjia.dal.MongoEntity; + +import javax.persistence.*; +import java.util.Date; + +@Entity +@Table(name = "business.deal_sample") +public class DealSample implements MongoEntity { + private String id; + private String city; + private String district; + private String name; + private Number unitPrice; + private Integer totalPrice; + private Double size; + private String type; + private Integer floor; + private Date caseDate; + private String decoration; + private String direction;//朝向 + private Integer maxFloor; + private Integer room; + private Integer hall; + private Integer yearMonth; + private String cat; + private Object location; + + @Column(name = "city") + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + @Column(name = "district") + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + @Column(name = "name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Column(name = "unitPrice") + public Number getUnitPrice() { + return unitPrice; + } + + public void setUnitPrice(Number unitPrice) { + this.unitPrice = unitPrice; + } + + @Column(name = "totalPrice") + public Integer getTotalPrice() { + return totalPrice; + } + + public void setTotalPrice(Integer totalPrice) { + this.totalPrice = totalPrice; + } + + @Column(name = "size") + public Double getSize() { + return size; + } + + public void setSize(Double size) { + this.size = size; + } + + @Column(name = "type") + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + @Column(name = "floor") + public Integer getFloor() { + return floor; + } + + public void setFloor(Integer floor) { + this.floor = floor; + } + + @Column(name = "caseDate") + public Date getCaseDate() { + return caseDate; + } + + public void setCaseDate(Date caseDate) { + this.caseDate = caseDate; + } + + @Column(name = "decoration") + public String getDecoration() { + return decoration; + } + + public void setDecoration(String decoration) { + this.decoration = decoration; + } + + @Column(name = "direction") + public String getDirection() { + return direction; + } + + public void setDirection(String direction) { + this.direction = direction; + } + + @Column(name = "maxFloor") + public Integer getMaxFloor() { + return maxFloor; + } + + public void setMaxFloor(Integer maxFloor) { + this.maxFloor = maxFloor; + } + + @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 = "yearMonth") + public Integer getYearMonth() { + return yearMonth; + } + + public void setYearMonth(Integer yearMonth) { + this.yearMonth = yearMonth; + } + + @Column(name = "cat") + public String getCat() { + return cat; + } + + public void setCat(String cat) { + this.cat = cat; + } + + @Column(name = "location") + public Object getLocation() { + return location; + } + + public void setLocation(Object location) { + this.location = location; + } + + @Id + @GeneratedValue + @Column(name = "_id", unique = true, nullable = false) + public String getId() { + return id; + } + + @Override + public void setId(String id) { + this.id = id; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index 3b64243d8..63de531a2 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -1,6 +1,7 @@ package com.fangjia.open.controllers; import com.fangjia.core.util.*; +import com.fangjia.dal.mongo.fangjia.model.ServerArea; import com.fangjia.dal.mongo.model.ApiUserCfg; import com.fangjia.open.dto.BusinessCaseDto; import com.fangjia.open.interceptors.AuthenticationBean; @@ -11,6 +12,7 @@ import com.fangjia.open.model.BasicModel; import com.fangjia.open.model.CommercialModel; import com.fangjia.open.model.RestfulModelAndView; import com.fangjia.service.api.ApiUserCfgService; +import com.fangjia.service.mongo.fangjia.ServerAreaService; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; @@ -78,6 +80,7 @@ public class CommercialController { Double ratio = getUserPriceRatio(request); JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPSELL_EVALUATE); if (json != null) { + if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { List> list = new ArrayList>(); if (json.containsKey("case")) { @@ -370,4 +373,6 @@ public class CommercialController { public void setApiUserCfgService(ApiUserCfgService apiUserCfgService) { this.apiUserCfgService = apiUserCfgService; } + + } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java index 68a0fca8f..0cf225398 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java @@ -7,6 +7,7 @@ import com.fangjia.dal.mongo.fangjia.model.ServerArea; import com.fangjia.dal.mongo.model.ApiUserCfg; import com.fangjia.dal.mongo.model.Evaluation; import com.fangjia.dal.mongo.model.OfficeRentStat; +import com.fangjia.dal.mongo.model.bkoff.DealSample; import com.fangjia.dal.seawater.model.SeawaterDto; import com.fangjia.dal.seaweed.model.District; import com.fangjia.open.HttpCode; @@ -27,12 +28,15 @@ import com.fangjia.service.datastore.FieldFilterService; import com.fangjia.service.datastore.OfficeService; import com.fangjia.service.datastore.OpenApiLogService; import com.fangjia.service.datastore.dto.OfficeEvaluationDto; +import com.fangjia.service.mongo.fangjia.DealSampleService; +import com.fangjia.service.mongo.fangjia.ServerAreaService; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.bson.types.ObjectId; import org.slf4j.Logger; +import org.sothis.core.util.Pager; import org.sothis.web.mvc.ActionContext; import org.sothis.web.mvc.annotation.Param; @@ -63,6 +67,8 @@ public class OfficeController { private AddressParser addressParser; private FieldFilterService fieldFilterService; private ApiUserCfgService apiUserCfgService; + private ServerAreaService serverAreaService; + private DealSampleService dealSampleService; /** * 城市出租均价 @@ -767,6 +773,13 @@ public class OfficeController { return mav; } + if(district.getCity()!=null){ + ServerArea serverArea = serverAreaService.findByDisplay(district.getCity()); + if(serverArea!=null && serverArea.getNewCityGrade()>=3000){ + mav.setModel(BasicModel.buildServerErrorModel().setMsg("当前仅支持一、二线城市,暂不支持您选择的城市")); + return mav; + } + } model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); @@ -787,6 +800,121 @@ public class OfficeController { } + public Object rentSampleAction(PropertyEvaluationModel model, HttpServletRequest request) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (StringUtils.isBlank(model.getCity()) || model.getSize()<=0) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,面积为必填项")); + return mav; + } + + if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:名称或地址至少填一个")); + return mav; + } + /* 先到CPDB库中查找写字楼 */ + District district = null; + Double ratio = getUserPriceRatio(request); + + if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())) { + district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "office"); + } + + if (district == null && (StringUtils.isNotBlank(model.getName()) || StringUtils.isNotBlank(model.getAddress()))) { + JSONObject resultObject = null; + if(StringUtils.isNotBlank(model.getAddress())){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), "office", false); + }else if(StringUtils.isNotBlank(model.getName())){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName(), "office", false); + } + if(resultObject != null){ + String id = (String) resultObject.get("id"); + district = districtService.findById(id); + } + } + + 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; + } + + if(district.getCity()!=null){ + ServerArea serverArea = serverAreaService.findByDisplay(district.getCity()); + if(serverArea!=null && serverArea.getNewCityGrade()>=3000){ + mav.setModel(BasicModel.buildServerErrorModel().setMsg("当前仅支持一、二线城市,暂不支持您选择的城市")); + return mav; + } + } + + model.setRegion(district.getRegion()); + model.setDistrictName(district.getName()); + + OfficeEvaluationDto evaluation = officeService.evaluateRent(district, buildEvaluation(model, request)); + Double minPrice = null; + Double maxPrice = null; + if (evaluation.getUnitPrice() != null && evaluation.getUnitPrice() != 0) { + + Pager pager = new Pager(); + pager.setStartRow(0); + if (model.getPageSize() != null) { + if(model.getPageSize() <=50){ + pager.setPageSize(model.getPageSize()); + }else{ + pager.setPageSize(50); + } + } else { + pager.setPageSize(5); + } + + if(model.getMinPrice() == null){ + if(evaluation != null) { + minPrice = evaluation.getUnitPrice() - evaluation.getUnitPrice() * 0.1; + maxPrice = evaluation.getUnitPrice() + evaluation.getUnitPrice().intValue() * 0.1; + } + }else{ + if(model.getMinPrice() != null && model.getMinPrice()>0){ + minPrice = model.getMinPrice().doubleValue(); + } + if(model.getMaxPrice() != null && model.getMaxPrice()>0){ + maxPrice = model.getMaxPrice().doubleValue(); + } + } + + Double lng = district.getLng()/10000000000.0; + Double lat = district.getLat()/10000000000.0; + List houseSelf = dealSampleService.querySampleByLocation(lng, lat, DataUtil.getDoubleRound(2, minPrice), DataUtil.getDoubleRound(2, maxPrice), "office_rent", pager.getPageSize()); + List createBusiness = createSample(houseSelf, "office_rent", district, ratio, lng, lat); + + mav.setModel(BasicModel.buildOKModel().setResult(createBusiness)); + if(createBusiness!=null && createBusiness.size()<5){ + BasicModel.markNoDataRequest(); + } + return mav; + } +// mav.setModel(BasicModel.buildOKModel().markNoData()); + return mav; + } + + + + private Integer getFloor(String roomNumber) { if (StringUtils.isNotBlank(roomNumber) && DataUtil.isNumber(roomNumber)) { if (roomNumber.length() == 3) { @@ -1039,6 +1167,60 @@ public class OfficeController { } return null; } + private List createSample(List seawaterDtos, String cat, District district, Double ratio, Double lng, Double lat){ + if(seawaterDtos != null && seawaterDtos.size()>0){ + List dtos = new ArrayList(); + for(DealSample house : seawaterDtos){ + BusinessCaseDto dto = new BusinessCaseDto(); + dto.setCity(house.getCity()); + dto.setDistrict(house.getDistrict()); + dto.setName(house.getName()); + + if(ratio != null){ + Integer totalPrice = (int) (house.getTotalPrice()*ratio); + if(cat.equals("office_rent")){ + Double dayPrice = totalPrice/(house.getSize()*30); + dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + }else{ + Integer avgPrie = (int)(totalPrice/house.getSize()); + dto.setUnitPrice(avgPrie); + } + dto.setTotalPrice(totalPrice); + }else{ + if(cat.equals("office_rent")){ + Double dayPrice = house.getTotalPrice()/(house.getSize()*30); + dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + }else{ + dto.setUnitPrice(house.getUnitPrice()); + } + dto.setTotalPrice(house.getTotalPrice()); + + } + + if(StringUtils.isNotBlank(house.getType())){ + dto.setType(house.getType()); + } + + Map locationMap = (Map) house.getLocation(); + double distance = GeoUtils.calculateDistance(locationMap.get("lon"), locationMap.get("lat"), lng, lat); + dto.setDistance((int)distance); + + dto.setSize(house.getSize()); + if (house.getYearMonth() != null && house.getYearMonth() > 10000000) { + String numberStr = String.valueOf(house.getYearMonth()); + // 拆分字符串并格式化 + String year = numberStr.substring(0, 4); // 前四位是年份 + String month = numberStr.substring(4, 6); // 中间两位是月份 + String day = numberStr.substring(6, 8); // 最后两位是日期 + String formattedDate = year + "-" + month + "-" + day; + dto.setCaseDate(formattedDate); + } + dtos.add(dto); + } + return dtos; + } + return null; + } public void setOpenApiLogService(OpenApiLogService openApiLogService) { this.openApiLogService = openApiLogService; @@ -1067,4 +1249,12 @@ public class OfficeController { public void setApiUserCfgService(ApiUserCfgService apiUserCfgService) { this.apiUserCfgService = apiUserCfgService; } + + public void setServerAreaService(ServerAreaService serverAreaService) { + this.serverAreaService = serverAreaService; + } + + public void setDealSampleService(DealSampleService dealSampleService) { + this.dealSampleService = dealSampleService; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java index e96f24d70..516054472 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java @@ -10,6 +10,8 @@ import com.fangjia.dal.mongo.fangjia.model.ServerArea; import com.fangjia.dal.mongo.model.ApiUserCfg; import com.fangjia.dal.mongo.model.Evaluation; import com.fangjia.dal.mongo.model.OfficeSellStat; +import com.fangjia.dal.mongo.model.SqmetreRent; +import com.fangjia.dal.mongo.model.bkoff.DealSample; import com.fangjia.dal.seawater.model.SeawaterDto; import com.fangjia.dal.seaweed.model.District; import com.fangjia.open.HttpCode; @@ -28,12 +30,15 @@ import com.fangjia.service.datastore.DistrictService; import com.fangjia.service.datastore.OfficeService; import com.fangjia.service.datastore.OpenApiLogService; import com.fangjia.service.datastore.dto.OfficeEvaluationDto; +import com.fangjia.service.mongo.fangjia.DealSampleService; +import com.fangjia.service.mongo.fangjia.ServerAreaService; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; +import org.sothis.core.util.Pager; import org.sothis.web.mvc.ActionContext; import org.sothis.web.mvc.annotation.Param; @@ -57,6 +62,8 @@ public class OfficeSellController { private OpenApiLogService openApiLogService; private AddressMatchProxyService addressMatchProxyService; private ApiUserCfgService apiUserCfgService; + private ServerAreaService serverAreaService; + private DealSampleService dealSampleService; /** * 写字楼城市出售均价 * @@ -284,6 +291,15 @@ public class OfficeSellController { return mav; } + if(district.getCity()!=null){ + ServerArea serverArea = serverAreaService.findByDisplay(district.getCity()); + if(serverArea!=null && serverArea.getNewCityGrade()>=3000){ + mav.setModel(BasicModel.buildServerErrorModel().setMsg("当前仅支持一、二线城市,暂不支持您选择的城市")); + return mav; + } + } + + if (model.getFloor() == null) { JSONObject structureOb = addressMatchProxyService.addressStructure(district.getCity(), model.getAddress()); if (structureOb != null) { @@ -486,6 +502,15 @@ public class OfficeSellController { mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); return mav; } + + if(district.getCity()!=null){ + ServerArea serverArea = serverAreaService.findByDisplay(district.getCity()); + if(serverArea!=null && serverArea.getNewCityGrade()>=3000){ + mav.setModel(BasicModel.buildServerErrorModel().setMsg("当前仅支持一、二线城市,暂不支持您选择的城市")); + return mav; + } + } + model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); OfficeEvaluationDto evaluation = officeService.evaluateSell(district, buildEvaluation(model, request)); @@ -504,6 +529,132 @@ public class OfficeSellController { } + /** + * 湖北征信定制写字楼案例接口 + * @param model + * @param request + * @return + */ + public Object sellSampleAction(PropertyEvaluationModel model, HttpServletRequest request) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (StringUtils.isBlank(model.getCity()) || model.getSize()<=0) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,面积为必填项")); + return mav; + } + + if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:名称或地址至少填一个")); + return mav; + } + + Double ratio = getUserPriceRatio(request); + /* 先到CPDB库中查找写字楼 */ + District district = null; + + if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())) { + district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "office"); + } + if (district == null) { + if (StringUtils.isNotBlank(model.getDistrict()) && (model.getDistrict().contains("市辖区") || model.getDistrict().contains(model.getCity()))) { + district = districtService.findByNameAndAlias(model.getCity(), null, model.getName(), "office"); + } + + } + + if (district == null && (StringUtils.isNotBlank(model.getName()) || StringUtils.isNotBlank(model.getAddress()))) { + JSONObject resultObject = null; + if(StringUtils.isNotBlank(model.getAddress())){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), "office", false); + }else if(StringUtils.isNotBlank(model.getName())){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName(), "office", false); + } + if(resultObject != null){ + String id = (String) resultObject.get("id"); + district = districtService.findById(id); + } + } + + 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; + } + + if(district.getCity()!=null){ + ServerArea serverArea = serverAreaService.findByDisplay(district.getCity()); + if(serverArea!=null && serverArea.getNewCityGrade()>=3000){ + mav.setModel(BasicModel.buildServerErrorModel().setMsg("当前仅支持一、二线城市,暂不支持您选择的城市")); + return mav; + } + } + + model.setRegion(district.getRegion()); + model.setDistrictName(district.getName()); + OfficeEvaluationDto evaluation = officeService.evaluateSell(district, buildEvaluation(model, request)); + if (evaluation.getUnitPrice() != null && evaluation.getUnitPrice() != 0) { + + Pager pager = new Pager(); + pager.setStartRow(0); + if (model.getPageSize() != null) { + if(model.getPageSize() <=50){ + pager.setPageSize(model.getPageSize()); + }else{ + pager.setPageSize(50); + } + } else { + pager.setPageSize(5); + } + + if(model.getMinPrice() == null){ + if(evaluation != null) { + int minPrice = (int) (evaluation.getUnitPrice().intValue() - evaluation.getUnitPrice() * 0.1); + model.setMinPrice(minPrice); + + int maxPrice = (int) (evaluation.getUnitPrice() + evaluation.getUnitPrice().intValue() * 0.1); + model.setMaxPrice(maxPrice); + } + }else{ + if(model.getMinPrice() != null && model.getMinPrice()>0){ + model.setMinPrice(model.getMinPrice()); + } + if(model.getMaxPrice() != null && model.getMaxPrice()>0){ + model.setMaxPrice(model.getMaxPrice()); + } + } + + Double lng = district.getLng()/10000000000.0; + Double lat = district.getLat()/10000000000.0; + List houseSelf = dealSampleService.querySampleByLocation(lng, lat, model.getMinPrice(), model.getMaxPrice(), "office_sell", pager.getPageSize()); + List createBusiness = createSample(houseSelf, "office_sell", district, ratio, lng, lat); + + mav.setModel(BasicModel.buildOKModel().setResult(createBusiness)); + if(createBusiness !=null && createBusiness.size()<5){ + BasicModel.markNoDataRequest(); + } + return mav; + } +// mav.setModel(BasicModel.buildOKModel().markNoData()); + return mav; + } + + + private Integer getFloor(String roomNumber) { if (StringUtils.isNotBlank(roomNumber) && DataUtil.isNumber(roomNumber)) { if (roomNumber.length() == 3) { @@ -731,6 +882,62 @@ public class OfficeSellController { } + private List createSample(List seawaterDtos, String cat, District district, Double ratio, Double lng, Double lat){ + if(seawaterDtos != null && seawaterDtos.size()>0){ + List dtos = new ArrayList(); + for(DealSample house : seawaterDtos){ + BusinessCaseDto dto = new BusinessCaseDto(); + dto.setCity(house.getCity()); + dto.setDistrict(house.getDistrict()); + dto.setName(house.getName()); + + if(ratio != null){ + Integer totalPrice = (int) (house.getTotalPrice()*ratio); + if(cat.equals("office_rent")){ + Double dayPrice = totalPrice/(house.getSize()*30); + dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + }else{ + Integer avgPrie = (int)(totalPrice/house.getSize()); + dto.setUnitPrice(avgPrie); + } + dto.setTotalPrice(totalPrice); + }else{ + if(cat.equals("office_rent")){ + Double dayPrice = house.getTotalPrice()/(house.getSize()*30); + dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + }else{ + dto.setUnitPrice(house.getUnitPrice()); + } + dto.setTotalPrice(house.getTotalPrice()); + + } + + if(StringUtils.isNotBlank(house.getType())){ + dto.setType(house.getType()); + } + + Map locationMap = (Map) house.getLocation(); + double distance = GeoUtils.calculateDistance(locationMap.get("lon"), locationMap.get("lat"), lng, lat); + dto.setDistance((int)distance); + + dto.setSize(house.getSize()); + if (house.getYearMonth() != null && house.getYearMonth() > 10000000) { + String numberStr = String.valueOf(house.getYearMonth()); + // 拆分字符串并格式化 + String year = numberStr.substring(0, 4); // 前四位是年份 + String month = numberStr.substring(4, 6); // 中间两位是月份 + String day = numberStr.substring(6, 8); // 最后两位是日期 + String formattedDate = year + "-" + month + "-" + day; + dto.setCaseDate(formattedDate); + } + dtos.add(dto); + } + return dtos; + } + return null; + } + + private Double getUserPriceRatio(HttpServletRequest request){ Double ratio = null; AuthenticationBean authenticationBean = (AuthenticationBean) request @@ -765,4 +972,12 @@ public class OfficeSellController { public void setApiUserCfgService(ApiUserCfgService apiUserCfgService) { this.apiUserCfgService = apiUserCfgService; } + + public void setServerAreaService(ServerAreaService serverAreaService) { + this.serverAreaService = serverAreaService; + } + + public void setDealSampleService(DealSampleService dealSampleService) { + this.dealSampleService = dealSampleService; + } } 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 f3e7ea974..31ff3d1c7 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 @@ -25,6 +25,8 @@ import com.fangjia.core.util.*; import com.fangjia.dal.*; import com.fangjia.dal.mongo.dao.AliasFangDao; import com.fangjia.dal.mongo.model.*; +import com.fangjia.dal.mongo.model.bkoff.*; +import com.fangjia.dal.mongo.model.bkoff.HouseLoudong; import com.fangjia.dal.mongo.open.model.CommunityBasePrice; import com.fangjia.dal.mongo.open.model.CommunityPoi; import com.fangjia.dal.mongo.open.model.EvaluateRatio; @@ -66,10 +68,6 @@ import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.common.ServerAreaData; import com.fangjia.dal.datastore.model.House; import com.fangjia.dal.mongo.fangjia.model.ServerArea; -import com.fangjia.dal.mongo.model.bkoff.DealPrice; -import com.fangjia.dal.mongo.model.bkoff.HouseAuction; -import com.fangjia.dal.mongo.model.bkoff.HouseLoudong; -import com.fangjia.dal.mongo.model.bkoff.Loudong; import com.fangjia.dal.mongo.open.model.ApiUserAuthority; import com.fangjia.dal.seaweed.model.District; import com.fangjia.dal.sql.model.ApiUser; @@ -179,6 +177,7 @@ public class PropertyController { private CommunityBasePriceService communityBasePriceService; private EvaluateFactorService evaluateFactorService; + private FileDao fileDao = FileDao.getInstance(); private static final int DEFAULT_PAGE_SIZE = 20; private static final int DEFAULT_HOUSE_COUNT = 5; @@ -195,6 +194,7 @@ public class PropertyController { private RentDealPriceService rentDealPriceService; private EvaluateRatioService evaluateRatioService; private AliasFangService aliasFangService; + private DealSampleService dealSampleService; private static final int EVALUATE_SHOW_DETAIL = 1; private static final Map PROPERTY_TYPES = new HashMap() { @@ -6245,10 +6245,10 @@ public class PropertyController { model.setMaxPrice(maxPrice); } }else{ - if(model.getMinPrice() != null && model.getMinPrice()>0){ + if(model.getMinPrice() != null ){ model.setMinPrice(model.getMinPrice()); } - if(model.getMaxPrice() != null && model.getMaxPrice()>0){ + if(model.getMaxPrice() != null ){ model.setMaxPrice(model.getMaxPrice()); } } @@ -6385,6 +6385,12 @@ public class PropertyController { } + /** + * 公用案例接口 + * @param model + * @param request + * @return + */ public Object rentCaseAction(PropertyEvaluationModel model, HttpServletRequest request){ RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); @@ -6580,6 +6586,116 @@ public class PropertyController { return mav; } + /** + * 湖北征信定制接口 + * @param model + * @param request + * @return + */ + public Object rentSampleAction(PropertyEvaluationModel model, HttpServletRequest request){ + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (StringUtils.isBlank(model.getCity())) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市为必填项")); + return mav; + } + + if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:名称或地址至少填一个")); + return mav; + } + + District district = null; + String estateType = null; + if(StringUtils.isNotBlank(model.getPropertyType())){ + if(model.getPropertyType().equals("0")){ + estateType = "普通住宅"; + }else if(model.getPropertyType().equals("1")){ + estateType = "别墅"; + }else if(model.getPropertyType().equals("2")){ + estateType = "商住"; + } + } + + if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())){ + district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); + } + + if (district == null && (StringUtils.isNotBlank(model.getName()) || StringUtils.isNotBlank(model.getAddress()))) { + JSONObject resultObject = null; + if(StringUtils.isNotBlank(model.getAddress())){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), "property", false); + }else if(StringUtils.isNotBlank(model.getName())){ + if(estateType !=null && estateType.equals("别墅") && !model.getName().contains("别墅")){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName()+"别墅", "property", false); + }else{ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName(), "property", false); + } + + } + + if(resultObject != null){ + String id = (String) resultObject.get("id"); + district = districtService.findById(id); + } + } + if(district == null && StringUtils.isBlank(model.getLocation())){ + mav.setModel(BasicModel.buildOKModel().setResult(null)); + return mav; + } + + + List caseDtos = new ArrayList(); + + Pager pager = new Pager(); + pager.setStartRow(0); + if (model.getPageSize() != null) { + if(model.getPageSize() <=50){ + pager.setPageSize(model.getPageSize()); + }else{ + pager.setPageSize(50); + } + } else { + pager.setPageSize(5); + } + Double ratio = getUserPriceRatio(request); + Double minPrice = null; + Double maxPrice = null; + + if(district != null){ + if(model.getMinPrice() == null){ + SqmetreRent rent = sqmetreRentService.findNearestSqmetreRent(district.getCity(), district.getRegion(), district.getName(), "district"); + + if(rent != null) { + double avgPrice = DataUtil.getRound(2, rent.getAvgPrice().intValue()/30); + minPrice = avgPrice - avgPrice * 0.1; + maxPrice = avgPrice + avgPrice * 0.1; + } + }else{ + if(model.getMinPrice() != null){ + minPrice = Double.valueOf(model.getMinPrice()); + } + if(model.getMaxPrice() != null){ + maxPrice = Double.valueOf(model.getMaxPrice()); + } + } + + if(caseDtos.size() < pager.getPageSize()){ + List houseSelf = dealSampleService.querySampleByLocation(district.getLng()/10000000000.0, district.getLat()/10000000000.0, minPrice, maxPrice, "rent", pager.getPageSize()); + if(houseSelf!=null && houseSelf.size()>0){ + caseDtos = createHouseSample(caseDtos, houseSelf, model.getShowSource(), ratio, district.getLng()/10000000000.0, district.getLat()/10000000000.0); + } + + } + } + mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); + if(caseDtos!=null && caseDtos.size()<5){ + BasicModel.markNoDataRequest(); + } + return mav; + } + private List createDealHouseCase(List caseDtos, List dealPrices,int distance, Integer showSource){ @@ -6617,6 +6733,82 @@ public class PropertyController { return null; } + private List createHouseSample(List caseDtos, List houses, Integer showSource, Double ratio, Double lng, Double lat){ + if (houses != null && !houses.isEmpty()) { + Set seenIds = new HashSet(); + Iterator iterator = houses.iterator(); + while (iterator.hasNext()) { + DealSample s = iterator.next(); + if (!seenIds.add(s.getId())) { + // 如果已经存在,则从列表中移除 + iterator.remove(); + } + } + + List ids = new ArrayList(); + for(HouseCaseDto dto : caseDtos){ + ids.add(dto.getId()); + } + for (DealSample house : houses) { + if(!ids.contains(house.getId())){ + HouseCaseDto caseDto = new HouseCaseDto(); + caseDto.setId(house.getId()); + caseDto.setCity(house.getCity()); + caseDto.setDistrict(house.getDistrict()); + caseDto.setName(house.getName()); + caseDto.setSize(house.getSize() == null || house.getSize() == 0 ? null : house.getSize()); + + if(house.getTotalPrice()!=null){ + if(ratio!=null){ + Integer totalPrice = new BigDecimal(house.getTotalPrice() * ratio).setScale(0, BigDecimal.ROUND_HALF_UP).intValue(); + caseDto.setTotalPrice(totalPrice); + if(house.getCat().equals("sell")){ + caseDto.setUnitPrice(new BigDecimal(totalPrice/house.getSize()).setScale(0, BigDecimal.ROUND_HALF_UP).intValue()); + }else if(house.getCat().equals("rent")){ +// Double dayPrice = house.getTotalPrice()/(30*house.getArea()); + Double dayPrice = totalPrice/(30*house.getSize()); + caseDto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + } + }else{ + caseDto.setTotalPrice(house.getTotalPrice() == null || house.getTotalPrice() == 0 ? null : house.getTotalPrice()); + if(house.getCat().equals("sell")){ + caseDto.setUnitPrice(house.getUnitPrice()); + }else if(house.getCat().equals("rent")){ + Double dayPrice = house.getTotalPrice()/(30*house.getSize()); + caseDto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + } + } + } + caseDto.setDirection(house.getDirection()); + caseDto.setDecoration(house.getDecoration()); + caseDto.setFloor(house.getFloor() == null || house.getFloor() == 0 ? null : house.getFloor()); + caseDto.setMaxFloor(house.getMaxFloor()); + caseDto.setRoom(house.getRoom() == null || house.getRoom() == 0 ? null : house.getRoom().toString()); + caseDto.setHall(house.getHall() == null || house.getHall() == 0 ? null : house.getHall().toString()); + + if (house.getYearMonth() != null && house.getYearMonth() > 10000000) { + String numberStr = String.valueOf(house.getYearMonth()); + // 拆分字符串并格式化 + String year = numberStr.substring(0, 4); // 前四位是年份 + String month = numberStr.substring(4, 6); // 中间两位是月份 + String day = numberStr.substring(6, 8); // 最后两位是日期 + String formattedDate = year + "-" + month + "-" + day; + caseDto.setCaseDate(formattedDate); + } + + Map locationMap = (Map) house.getLocation(); + double distance = GeoUtils.calculateDistance(locationMap.get("lon"), locationMap.get("lat"), lng, lat); + caseDto.setDistance((int)distance); + if(showSource!=null && showSource==1){ + caseDto.setSource("成交"); + } + caseDtos.add(caseDto); + } + } + } + return caseDtos; + } + private List createHouseCase(List caseDtos, List houses, Integer showSource, Double ratio){ if (houses != null && !houses.isEmpty()) { @@ -6899,4 +7091,8 @@ public class PropertyController { public void setAliasFangService(AliasFangService aliasFangService) { this.aliasFangService = aliasFangService; } + + public void setDealSampleService(DealSampleService dealSampleService) { + this.dealSampleService = dealSampleService; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleService.java new file mode 100644 index 000000000..94c928056 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleService.java @@ -0,0 +1,10 @@ +package com.fangjia.service.mongo.fangjia; + +import com.fangjia.dal.mongo.model.bkoff.DealSample; +import scala.math.Numeric; + +import java.util.List; + +public interface DealSampleService { + List querySampleByLocation(Double lng, Double lat, Number minPrice, Number maxPrice, String cat, int pageSize); +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleServiceImpl.java new file mode 100644 index 000000000..eaa56d9cb --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleServiceImpl.java @@ -0,0 +1,62 @@ +package com.fangjia.service.mongo.fangjia; + +import com.fangjia.core.util.DateUtil; +import com.fangjia.dal.QueryParam; +import com.fangjia.dal.SortParam; +import com.fangjia.dal.mongo.dao.bkoff.DealSampleDao; +import com.fangjia.dal.mongo.model.OfficeRentStat; +import com.fangjia.dal.mongo.model.bkoff.DealSample; +import com.mongodb.BasicDBObject; +import org.apache.commons.lang.StringUtils; +import scala.math.Numeric; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class DealSampleServiceImpl implements DealSampleService{ + + private DealSampleDao dealSampleDao; + + public DealSampleDao getDealSampleDao() { + return dealSampleDao; + } + + public void setDealSampleDao(DealSampleDao dealSampleDao) { + this.dealSampleDao = dealSampleDao; + } + + @Override + public List querySampleByLocation(Double lng, Double lat, Number minPrice, Number maxPrice, String cat, int pageSize) { + if(lng!=null && lat!=null){ + List params = new ArrayList(); + BasicDBObject geo = new BasicDBObject(); + BasicDBObject nearQuery = new BasicDBObject(); +// nearQuery.append("$geometry", new double[]{lng, lat}); + nearQuery.append("$geometry", new BasicDBObject("type", "Point").append("coordinates", new double[]{lng, lat})); + nearQuery.append("$maxDistance", 3000); + geo.append("$near", nearQuery); + + params.add(new QueryParam("cat", cat)); + params.add(new QueryParam("location", geo)); + + Date date = DateUtil.truncateDay(DateUtil.addMonthToDate(new Date(), -12)); + params.add(new QueryParam("caseDate", QueryParam.GREATER_THAN_EQUAL_OPERATOR, date)); + + if(minPrice != null){ + params.add(new QueryParam("unitPrice", QueryParam.GREATER_THAN_EQUAL_OPERATOR, minPrice)); + } + if(maxPrice != null){ + params.add(new QueryParam("unitPrice", QueryParam.LESS_THAN_EQUAL_OPERATOR, maxPrice)); + } + + // 按日期降序排序,取最新的数据,可能上月还未更新,则取上上个月的数据 +// List sortParams = new ArrayList(); +// sortParams.add(new SortParam("caseDate", false)); + + List samples = dealSampleDao.findAllByParams(params, pageSize); + return samples; + } + return null; + } +} From 7898ccbc1a90b0a73b3e0da6936181a136923ab7 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Wed, 28 Jan 2026 15:02:32 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mongo/model/bkoff/DealSample.java | 12 +- .../controllers/CommercialController.java | 154 +++++++++++++++++- .../open/controllers/OfficeController.java | 11 +- .../controllers/OfficeSellController.java | 15 +- .../open/controllers/PropertyController.java | 10 +- .../fangjia/open/model/CommercialModel.java | 20 +++ .../src/main/resources/urlrewrite2.0.xml | 20 +++ 7 files changed, 201 insertions(+), 41 deletions(-) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealSample.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealSample.java index c1e210ed4..463b47bcd 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealSample.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/DealSample.java @@ -23,7 +23,7 @@ public class DealSample implements MongoEntity { private Integer maxFloor; private Integer room; private Integer hall; - private Integer yearMonth; + private Integer yearmonth; private String cat; private Object location; @@ -153,13 +153,13 @@ public class DealSample implements MongoEntity { this.hall = hall; } - @Column(name = "yearMonth") - public Integer getYearMonth() { - return yearMonth; + @Column(name = "yearmonth") + public Integer getYearmonth() { + return yearmonth; } - public void setYearMonth(Integer yearMonth) { - this.yearMonth = yearMonth; + public void setYearmonth(Integer yearmonth) { + this.yearmonth = yearmonth; } @Column(name = "cat") diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index 63de531a2..e9cb7ecf1 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -3,6 +3,7 @@ package com.fangjia.open.controllers; import com.fangjia.core.util.*; import com.fangjia.dal.mongo.fangjia.model.ServerArea; import com.fangjia.dal.mongo.model.ApiUserCfg; +import com.fangjia.dal.mongo.model.bkoff.DealSample; import com.fangjia.open.dto.BusinessCaseDto; import com.fangjia.open.interceptors.AuthenticationBean; import com.fangjia.open.interceptors.Authority; @@ -12,6 +13,7 @@ import com.fangjia.open.model.BasicModel; import com.fangjia.open.model.CommercialModel; import com.fangjia.open.model.RestfulModelAndView; import com.fangjia.service.api.ApiUserCfgService; +import com.fangjia.service.mongo.fangjia.DealSampleService; import com.fangjia.service.mongo.fangjia.ServerAreaService; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -26,12 +28,13 @@ import java.util.*; * * @since 2025/9/16 */ -@Authority(role = Role.USER) +//@Authority(role = Role.USER) public class CommercialController { private static final List GAODE_LEVEL = Arrays.asList("兴趣点", "门牌号", "单元号", "楼层", "房间", "门址", "住宅区","村庄"); private ApiUserCfgService apiUserCfgService; + private DealSampleService dealSampleService; public Object shopSellEvaluateAction(CommercialModel model, HttpServletRequest request) { @@ -82,7 +85,6 @@ public class CommercialController { if (json != null) { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { - List> list = new ArrayList>(); if (json.containsKey("case")) { List dtos = createBusiness((JSONArray) json.get("case"), "sell", ratio); mav.setModel(BasicModel.buildOKModel().setResult(dtos)); @@ -100,6 +102,60 @@ public class CommercialController { return mav; } + /** + * 湖北征信定制接口 + * @param model + * @param request + * @return + */ + public Object shopSellCaseAction(CommercialModel model, HttpServletRequest request) { + + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + mav = checkParmas(model, mav); + if(mav.model()!=null){ + return mav; + } + Double ratio = getUserPriceRatio(request); + JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPSELL_EVALUATE); + if (json != null) { + + if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { + if (json.containsKey("unitPrice") && json.containsKey("lng")) { + + if(json.get("unitPrice") != null){ + int unitPrice = (Integer) json.get("unitPrice"); + int minPrice = (int) (unitPrice - unitPrice * 0.1); + model.setMinPrice(minPrice); + + int maxPrice = (int) (unitPrice + unitPrice * 0.1); + model.setMaxPrice(maxPrice); + }else{ + if(model.getMinPrice() != null && model.getMinPrice()>0){ + model.setMinPrice(model.getMinPrice()); + } + if(model.getMaxPrice() != null && model.getMaxPrice()>0){ + model.setMaxPrice(model.getMaxPrice()); + } + } + Double lng = json.getDouble("lng"); + Double lat = json.getDouble("lat"); + List houseSelf = dealSampleService.querySampleByLocation(lng, lat, model.getMinPrice(), model.getMaxPrice(), "shop_sell", 5); + List dtos = createSample(houseSelf, "sell", ratio, lng, lat); + mav.setModel(BasicModel.buildOKModel().setResult(dtos)); + if(dtos!=null && dtos.size()<5){ + BasicModel.markNoDataRequest(); + } + } + }else{ + mav.setModel(BasicModel.buildServerErrorModel().setMsg(json.getString("msg"))); + } + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + + return mav; + } /** * 商铺出租 @@ -211,6 +267,57 @@ public class CommercialController { } + private List createSample(List cases, String cat, Double ratio, Double lng, Double lat){ + if(cases != null && cases.size()>0){ + List dtos = new ArrayList(); + for(DealSample sample : cases){ + BusinessCaseDto dto = new BusinessCaseDto(); + dto.setCity(sample.getCity()); + dto.setDistrict(sample.getDistrict()); + dto.setName(sample.getName()); +// dto.setLocation(sample.getString("location")); + + if(ratio != null){ + Integer totalPrice = (int)(sample.getTotalPrice().intValue() * ratio); + if(cat.equals("rent")){ + Double dayPrice = totalPrice/sample.getSize()*30; + dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + }else{ + Integer avgPrie = (int)(totalPrice/sample.getSize()); + dto.setUnitPrice(avgPrie); + } + dto.setTotalPrice(totalPrice); + }else{ + if(cat.equals("rent")){ + Double dayPrice = sample.getTotalPrice()/(sample.getSize()*30); + dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); + }else{ + dto.setUnitPrice(sample.getUnitPrice()); + } + dto.setTotalPrice(sample.getTotalPrice()); + } + dto.setSize(sample.getSize()); + if(StringUtils.isNotBlank(sample.getType())){ + dto.setType(sample.getType()); + } + if(sample.getFloor()!=null){ + dto.setFloor(sample.getFloor()); + } + + dto.setCaseDate(DateUtil.formatByPattern(sample.getCaseDate(),"yyyy-MM-dd")); + + Map locationMap = (Map) sample.getLocation(); + double distance = GeoUtils.calculateDistance(locationMap.get("lon"), locationMap.get("lat"), lng, lat); + dto.setDistance((int)distance); + + dtos.add(dto); + } + return dtos; + } + return null; + } + + public Object shopRentSampleAction(CommercialModel model, HttpServletRequest request) { RestfulModelAndView mav = new RestfulModelAndView(); @@ -223,7 +330,6 @@ public class CommercialController { JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPRENT_EVALUATE); if (json != null) { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { - List> list = new ArrayList>(); if (json.containsKey("case")) { List dtos = createBusiness((JSONArray) json.get("case"), "rent", ratio); mav.setModel(BasicModel.buildOKModel().setResult(dtos)); @@ -242,6 +348,44 @@ public class CommercialController { } + /** + * 湖北征信定制出租案例接口 + * @param model + * @param request + * @return + */ + public Object shopRentCaseAction(CommercialModel model, HttpServletRequest request) { + + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + mav = checkParmas(model, mav); + if(mav.model()!=null){ + return mav; + } + Double ratio = getUserPriceRatio(request); + JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPRENT_EVALUATE); + if (json != null) { + if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { + if (json.containsKey("case")) { + List dtos = createBusiness((JSONArray) json.get("case"), "rent", ratio); + + + mav.setModel(BasicModel.buildOKModel().setResult(dtos)); + if(dtos!=null && dtos.size()<5){ + BasicModel.markNoDataRequest(); + } + } + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg(json.getString("msg"))); + } + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + + return mav; + } + + private RestfulModelAndView checkParmas(CommercialModel model, RestfulModelAndView mav){ if (StringUtils.isBlank(model.getAddress()) && StringUtils.isBlank(model.getLocation())) { @@ -374,5 +518,7 @@ public class CommercialController { this.apiUserCfgService = apiUserCfgService; } - + public void setDealSampleService(DealSampleService dealSampleService) { + this.dealSampleService = dealSampleService; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java index 0cf225398..7e0dd755d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java @@ -1206,15 +1206,8 @@ public class OfficeController { dto.setDistance((int)distance); dto.setSize(house.getSize()); - if (house.getYearMonth() != null && house.getYearMonth() > 10000000) { - String numberStr = String.valueOf(house.getYearMonth()); - // 拆分字符串并格式化 - String year = numberStr.substring(0, 4); // 前四位是年份 - String month = numberStr.substring(4, 6); // 中间两位是月份 - String day = numberStr.substring(6, 8); // 最后两位是日期 - String formattedDate = year + "-" + month + "-" + day; - dto.setCaseDate(formattedDate); - } + dto.setCaseDate(DateUtil.formatByPattern(house.getCaseDate(),"yyyy-MM-dd")); + dtos.add(dto); } return dtos; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java index 516054472..15b5811e5 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java @@ -1,10 +1,7 @@ package com.fangjia.open.controllers; import com.fangjia.core.RegionData; -import com.fangjia.core.util.AnalyticsUtil; -import com.fangjia.core.util.DataUtil; -import com.fangjia.core.util.GeoUtils; -import com.fangjia.core.util.LoggerFactory; +import com.fangjia.core.util.*; import com.fangjia.dal.common.ServerAreaData; import com.fangjia.dal.mongo.fangjia.model.ServerArea; import com.fangjia.dal.mongo.model.ApiUserCfg; @@ -921,15 +918,7 @@ public class OfficeSellController { dto.setDistance((int)distance); dto.setSize(house.getSize()); - if (house.getYearMonth() != null && house.getYearMonth() > 10000000) { - String numberStr = String.valueOf(house.getYearMonth()); - // 拆分字符串并格式化 - String year = numberStr.substring(0, 4); // 前四位是年份 - String month = numberStr.substring(4, 6); // 中间两位是月份 - String day = numberStr.substring(6, 8); // 最后两位是日期 - String formattedDate = year + "-" + month + "-" + day; - dto.setCaseDate(formattedDate); - } + dto.setCaseDate(DateUtil.formatByPattern(house.getCaseDate(),"yyyy-MM-dd")); dtos.add(dto); } return dtos; 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 31ff3d1c7..012150c4e 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 @@ -6786,15 +6786,7 @@ public class PropertyController { caseDto.setRoom(house.getRoom() == null || house.getRoom() == 0 ? null : house.getRoom().toString()); caseDto.setHall(house.getHall() == null || house.getHall() == 0 ? null : house.getHall().toString()); - if (house.getYearMonth() != null && house.getYearMonth() > 10000000) { - String numberStr = String.valueOf(house.getYearMonth()); - // 拆分字符串并格式化 - String year = numberStr.substring(0, 4); // 前四位是年份 - String month = numberStr.substring(4, 6); // 中间两位是月份 - String day = numberStr.substring(6, 8); // 最后两位是日期 - String formattedDate = year + "-" + month + "-" + day; - caseDto.setCaseDate(formattedDate); - } + caseDto.setCaseDate(DateUtil.formatByPattern(house.getCaseDate(),"yyyy-MM-dd")); Map locationMap = (Map) house.getLocation(); double distance = GeoUtils.calculateDistance(locationMap.get("lon"), locationMap.get("lat"), lng, lat); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java index a136e8ef0..60da71c02 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java @@ -23,6 +23,10 @@ public class CommercialModel extends FangjiaApiModel{ private Integer showSample;//是否显示样本 1:显示 + + private Integer maxPrice; + private Integer minPrice; + public String getAddress() { return address; } @@ -118,4 +122,20 @@ public class CommercialModel extends FangjiaApiModel{ public void setShowSample(Integer showSample) { this.showSample = showSample; } + + public Integer getMaxPrice() { + return maxPrice; + } + + public void setMaxPrice(Integer maxPrice) { + this.maxPrice = maxPrice; + } + + public Integer getMinPrice() { + return minPrice; + } + + public void setMinPrice(Integer minPrice) { + this.minPrice = minPrice; + } } diff --git a/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml b/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml index 52f11e6e6..26873f5f1 100644 --- a/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml +++ b/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml @@ -61,6 +61,12 @@ + + + /sellSample + + + @@ -75,6 +81,13 @@ + + + /sellSample + + + + /rentEvaluate @@ -87,5 +100,12 @@ + + + + /rentSample + + + \ No newline at end of file From 8bdb7b595c146d0e8a696beb2ddc6d6780232d4a Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Wed, 28 Jan 2026 17:09:12 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E6=B9=96=E5=8C=97=E5=BE=81=E4=BF=A1?= =?UTF-8?q?=E5=95=86=E9=93=BA=E5=AE=9A=E5=88=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/CommercialController.java | 45 ++++++++++++++----- .../open/controllers/OfficeController.java | 4 +- .../controllers/OfficeSellController.java | 6 +-- .../com/fangjia/open/dto/BusinessCaseDto.java | 10 ++--- 4 files changed, 43 insertions(+), 22 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index e9cb7ecf1..5e5eb15ec 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -139,7 +139,7 @@ public class CommercialController { } } Double lng = json.getDouble("lng"); - Double lat = json.getDouble("lat"); + Double lat = json.getDouble("lat"); List houseSelf = dealSampleService.querySampleByLocation(lng, lat, model.getMinPrice(), model.getMaxPrice(), "shop_sell", 5); List dtos = createSample(houseSelf, "sell", ratio, lng, lat); mav.setModel(BasicModel.buildOKModel().setResult(dtos)); @@ -147,9 +147,10 @@ public class CommercialController { BasicModel.markNoDataRequest(); } } - }else{ - mav.setModel(BasicModel.buildServerErrorModel().setMsg(json.getString("msg"))); } +// else{ +// mav.setModel(BasicModel.buildServerErrorModel().setMsg(json.getString("msg"))); +// } } else { mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } @@ -252,7 +253,7 @@ public class CommercialController { dto.setSize(jsonObject.getDouble("size")); if(jsonObject.containsKey("type")){ - dto.setType(jsonObject.getString("type")); + dto.setEstateType(jsonObject.getString("type")); } if(jsonObject.containsKey("floor")){ dto.setFloor(jsonObject.getInt("floor")); @@ -280,11 +281,11 @@ public class CommercialController { if(ratio != null){ Integer totalPrice = (int)(sample.getTotalPrice().intValue() * ratio); if(cat.equals("rent")){ - Double dayPrice = totalPrice/sample.getSize()*30; + Double dayPrice = totalPrice/(sample.getSize()*30); dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); }else{ - Integer avgPrie = (int)(totalPrice/sample.getSize()); - dto.setUnitPrice(avgPrie); + Integer avgPrice = BigDecimal.valueOf(totalPrice/sample.getSize()).setScale(0, BigDecimal.ROUND_HALF_UP).intValue(); + dto.setUnitPrice(avgPrice); } dto.setTotalPrice(totalPrice); }else{ @@ -298,7 +299,7 @@ public class CommercialController { } dto.setSize(sample.getSize()); if(StringUtils.isNotBlank(sample.getType())){ - dto.setType(sample.getType()); + dto.setEstateType(sample.getType()); } if(sample.getFloor()!=null){ dto.setFloor(sample.getFloor()); @@ -366,8 +367,27 @@ public class CommercialController { JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPRENT_EVALUATE); if (json != null) { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { - if (json.containsKey("case")) { - List dtos = createBusiness((JSONArray) json.get("case"), "rent", ratio); + if (json.containsKey("unitPrice") && json.containsKey("lng")) { + + Double minPrice = null; + Double maxPrice = null; + if(json.get("unitPrice") != null){ + Double unitPrice = (Double) json.get("unitPrice"); + minPrice = unitPrice - unitPrice * 0.1; + maxPrice = unitPrice + unitPrice * 0.1; + + }else{ + if(model.getMinPrice() != null && model.getMinPrice()>0){ + minPrice = model.getMinPrice().doubleValue(); + } + if(model.getMaxPrice() != null && model.getMaxPrice()>0){ + minPrice = model.getMaxPrice().doubleValue(); + } + } + Double lng = json.getDouble("lng"); + Double lat = json.getDouble("lat"); + List houseSelf = dealSampleService.querySampleByLocation(lng, lat, DataUtil.getDoubleRound(2, minPrice), DataUtil.getDoubleRound(2, maxPrice), "shop_rent", 5); + List dtos = createSample(houseSelf, "rent", ratio, lng, lat); mav.setModel(BasicModel.buildOKModel().setResult(dtos)); @@ -375,9 +395,10 @@ public class CommercialController { BasicModel.markNoDataRequest(); } } - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg(json.getString("msg"))); } +// else { +// mav.setModel(BasicModel.buildServerErrorModel().setMsg(json.getString("msg"))); +// } } else { mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java index 7e0dd755d..b76f21324 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java @@ -1143,7 +1143,7 @@ public class OfficeController { } if(StringUtils.isNotBlank(house.getEstateType())){ - dto.setType(house.getEstateType()); + dto.setEstateType(house.getEstateType()); } if(StringUtils.isNotBlank(house.getLocation()) && district.getLat()!=null){ @@ -1198,7 +1198,7 @@ public class OfficeController { } if(StringUtils.isNotBlank(house.getType())){ - dto.setType(house.getType()); + dto.setEstateType(house.getType()); } Map locationMap = (Map) house.getLocation(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java index 15b5811e5..c03b3bdb4 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java @@ -853,7 +853,7 @@ public class OfficeSellController { } if(StringUtils.isNotBlank(house.getEstateType())){ - dto.setType(house.getEstateType()); + dto.setEstateType(house.getEstateType()); } if(StringUtils.isNotBlank(house.getLocation()) && district.getLat()!=null){ @@ -894,7 +894,7 @@ public class OfficeSellController { Double dayPrice = totalPrice/(house.getSize()*30); dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); }else{ - Integer avgPrie = (int)(totalPrice/house.getSize()); + Integer avgPrie = BigDecimal.valueOf(totalPrice/house.getSize()).setScale(0, BigDecimal.ROUND_HALF_UP).intValue(); dto.setUnitPrice(avgPrie); } dto.setTotalPrice(totalPrice); @@ -910,7 +910,7 @@ public class OfficeSellController { } if(StringUtils.isNotBlank(house.getType())){ - dto.setType(house.getType()); + dto.setEstateType(house.getType()); } Map locationMap = (Map) house.getLocation(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/BusinessCaseDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/BusinessCaseDto.java index 246449c3c..b0fd56b1a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/BusinessCaseDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/BusinessCaseDto.java @@ -12,7 +12,7 @@ public class BusinessCaseDto { private Integer totalPrice;//总价(单位:元) private Integer floor;//所在楼层 private String caseDate;//案例时间(如: 2013-07-12) - private String type;//类型 + private String estateType;//类型 public String getId() { return id; @@ -102,11 +102,11 @@ public class BusinessCaseDto { this.caseDate = caseDate; } - public String getType() { - return type; + public String getEstateType() { + return estateType; } - public void setType(String type) { - this.type = type; + public void setEstateType(String estateType) { + this.estateType = estateType; } } From ce7aab4cac351d7b9c048e25d63f01040e65d1cf Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Thu, 29 Jan 2026 11:16:07 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E5=8E=BB=E6=89=93=E6=8A=98=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/CommercialController.java | 28 +++++++++---------- .../open/controllers/OfficeController.java | 2 +- .../controllers/OfficeSellController.java | 2 +- .../open/controllers/PropertyController.java | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index 5e5eb15ec..4d40799bc 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -116,12 +116,12 @@ public class CommercialController { if(mav.model()!=null){ return mav; } - Double ratio = getUserPriceRatio(request); + Double ratio = null;//getUserPriceRatio(request); JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPSELL_EVALUATE); if (json != null) { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { - if (json.containsKey("unitPrice") && json.containsKey("lng")) { + if (json.containsKey("unitPrice") && json.containsKey("location")) { if(json.get("unitPrice") != null){ int unitPrice = (Integer) json.get("unitPrice"); @@ -138,8 +138,9 @@ public class CommercialController { model.setMaxPrice(model.getMaxPrice()); } } - Double lng = json.getDouble("lng"); - Double lat = json.getDouble("lat"); + JSONObject locObj = json.getJSONObject("location"); + Double lng = locObj.getDouble("lon"); + Double lat = locObj.getDouble("lat"); List houseSelf = dealSampleService.querySampleByLocation(lng, lat, model.getMinPrice(), model.getMaxPrice(), "shop_sell", 5); List dtos = createSample(houseSelf, "sell", ratio, lng, lat); mav.setModel(BasicModel.buildOKModel().setResult(dtos)); @@ -147,10 +148,9 @@ public class CommercialController { BasicModel.markNoDataRequest(); } } + } else{ + mav.setModel(BasicModel.buildOKModel().setResult(null)); } -// else{ -// mav.setModel(BasicModel.buildServerErrorModel().setMsg(json.getString("msg"))); -// } } else { mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } @@ -363,11 +363,11 @@ public class CommercialController { if(mav.model()!=null){ return mav; } - Double ratio = getUserPriceRatio(request); + Double ratio = null;//getUserPriceRatio(request); JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPRENT_EVALUATE); if (json != null) { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { - if (json.containsKey("unitPrice") && json.containsKey("lng")) { + if (json.containsKey("unitPrice") && json.containsKey("location")) { Double minPrice = null; Double maxPrice = null; @@ -384,8 +384,9 @@ public class CommercialController { minPrice = model.getMaxPrice().doubleValue(); } } - Double lng = json.getDouble("lng"); - Double lat = json.getDouble("lat"); + JSONObject locObj = json.getJSONObject("location"); + Double lng = locObj.getDouble("lon"); + Double lat = locObj.getDouble("lat"); List houseSelf = dealSampleService.querySampleByLocation(lng, lat, DataUtil.getDoubleRound(2, minPrice), DataUtil.getDoubleRound(2, maxPrice), "shop_rent", 5); List dtos = createSample(houseSelf, "rent", ratio, lng, lat); @@ -395,10 +396,9 @@ public class CommercialController { BasicModel.markNoDataRequest(); } } + }else{ + mav.setModel(BasicModel.buildOKModel().setResult(null)); } -// else { -// mav.setModel(BasicModel.buildServerErrorModel().setMsg(json.getString("msg"))); -// } } else { mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java index b76f21324..735ee7e85 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java @@ -815,7 +815,7 @@ public class OfficeController { } /* 先到CPDB库中查找写字楼 */ District district = null; - Double ratio = getUserPriceRatio(request); + Double ratio = null;//getUserPriceRatio(request); if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())) { district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "office"); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java index c03b3bdb4..453ffc120 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java @@ -546,7 +546,7 @@ public class OfficeSellController { return mav; } - Double ratio = getUserPriceRatio(request); + Double ratio = null;//getUserPriceRatio(request); /* 先到CPDB库中查找写字楼 */ District district = null; 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 012150c4e..8903c3645 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 @@ -6659,7 +6659,7 @@ public class PropertyController { } else { pager.setPageSize(5); } - Double ratio = getUserPriceRatio(request); + Double ratio = null;//getUserPriceRatio(request); Double minPrice = null; Double maxPrice = null; From 593a29d36e2866d2210ca22f74dec097e23a9a68 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Thu, 29 Jan 2026 16:13:36 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E5=8A=A0id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/CommercialController.java | 2 + .../open/controllers/OfficeController.java | 2 + .../controllers/OfficeSellController.java | 2 + .../open/controllers/PropertyController.java | 118 +++++++++++++++++- 4 files changed, 123 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index 4d40799bc..190a1eea4 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -223,6 +223,7 @@ public class CommercialController { for(int i=0 ;i < cases.size(); i++){ JSONObject jsonObject = cases.getJSONObject(i); BusinessCaseDto dto = new BusinessCaseDto(); + dto.setId(jsonObject.getString("id")); dto.setCity(jsonObject.getString("city")); dto.setDistrict(jsonObject.getString("district")); dto.setName(jsonObject.getString("name")); @@ -273,6 +274,7 @@ public class CommercialController { List dtos = new ArrayList(); for(DealSample sample : cases){ BusinessCaseDto dto = new BusinessCaseDto(); + dto.setId(sample.getId()); dto.setCity(sample.getCity()); dto.setDistrict(sample.getDistrict()); dto.setName(sample.getName()); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java index 735ee7e85..dcec0ba44 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java @@ -1118,6 +1118,7 @@ public class OfficeController { List dtos = new ArrayList(); for(SeawaterDto house : seawaterDtos){ BusinessCaseDto dto = new BusinessCaseDto(); + dto.setId(house.getId()); dto.setCity(house.getCity()); dto.setDistrict(house.getDistrict()); dto.setName(house.getName()); @@ -1172,6 +1173,7 @@ public class OfficeController { List dtos = new ArrayList(); for(DealSample house : seawaterDtos){ BusinessCaseDto dto = new BusinessCaseDto(); + dto.setId(house.getId()); dto.setCity(house.getCity()); dto.setDistrict(house.getDistrict()); dto.setName(house.getName()); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java index 453ffc120..e4b4f6208 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java @@ -827,6 +827,7 @@ public class OfficeSellController { List dtos = new ArrayList(); for(SeawaterDto house : seawaterDtos){ BusinessCaseDto dto = new BusinessCaseDto(); + dto.setId(house.getId()); dto.setCity(house.getCity()); dto.setDistrict(house.getDistrict()); dto.setName(house.getName()); @@ -884,6 +885,7 @@ public class OfficeSellController { List dtos = new ArrayList(); for(DealSample house : seawaterDtos){ BusinessCaseDto dto = new BusinessCaseDto(); + dto.setId(house.getId()); dto.setCity(house.getCity()); dto.setDistrict(house.getDistrict()); dto.setName(house.getName()); 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 8903c3645..d3d1730cb 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 @@ -130,7 +130,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); private DistrictService districtService; @@ -6698,6 +6698,122 @@ public class PropertyController { + /** + * 湖北征信定制接口 + * @param model + * @param request + * @return + */ + public Object sellSampleAction(PropertyEvaluationModel model, HttpServletRequest request){ + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (StringUtils.isBlank(model.getCity())) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市为必填项")); + return mav; + } + + if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:名称或地址至少填一个")); + return mav; + } + + District district = null; + String estateType = null; + if(StringUtils.isNotBlank(model.getPropertyType())){ + if(model.getPropertyType().equals("0")){ + estateType = "普通住宅"; + }else if(model.getPropertyType().equals("1")){ + estateType = "别墅"; + }else if(model.getPropertyType().equals("2")){ + estateType = "商住"; + } + } + + if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())){ + district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); + } + + if (district == null && (StringUtils.isNotBlank(model.getName()) || StringUtils.isNotBlank(model.getAddress()))) { + JSONObject resultObject = null; + if(StringUtils.isNotBlank(model.getAddress())){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), "property", false); + }else if(StringUtils.isNotBlank(model.getName())){ + if(estateType !=null && estateType.equals("别墅") && !model.getName().contains("别墅")){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName()+"别墅", "property", false); + }else{ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName(), "property", false); + } + + } + + if(resultObject != null){ + String id = (String) resultObject.get("id"); + district = districtService.findById(id); + } + } + if(district == null && StringUtils.isBlank(model.getLocation())){ + mav.setModel(BasicModel.buildOKModel().setResult(null)); + return mav; + } + + + List caseDtos = new ArrayList(); + + Pager pager = new Pager(); + pager.setStartRow(0); + if (model.getPageSize() != null) { + if(model.getPageSize() <=50){ + pager.setPageSize(model.getPageSize()); + }else{ + pager.setPageSize(50); + } + } else { + pager.setPageSize(5); + } + Double ratio = null;//getUserPriceRatio(request); + Integer minPrice = null; + Integer maxPrice = null; + + if(district != null){ + if(model.getMinPrice() == null){ + DistrictStatBo statBo = districtStatService.findCurrentDistrictStat(new DistrictKey(district.getCity(), district.getRegion(), district.getName())); + if(statBo != null) { + Integer avgPrice = null; + if(StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().equals("别墅")){ + avgPrice = statBo.getVillaDistrictStat().getAvg_price_2b(); + }else{ + avgPrice = statBo.getDistrictStat().getAvg_price_2b(); + } + minPrice = (int)(avgPrice - avgPrice * 0.1); + maxPrice = (int)(avgPrice + avgPrice * 0.1); + } + }else{ + if(model.getMinPrice() != null){ + minPrice = model.getMinPrice(); + } + if(model.getMaxPrice() != null){ + maxPrice = model.getMaxPrice(); + } + } + + if(caseDtos.size() < pager.getPageSize()){ + List houseSelf = dealSampleService.querySampleByLocation(district.getLng()/10000000000.0, district.getLat()/10000000000.0, minPrice, maxPrice, "sell", pager.getPageSize()); + if(houseSelf!=null && houseSelf.size()>0){ + caseDtos = createHouseSample(caseDtos, houseSelf, model.getShowSource(), ratio, district.getLng()/10000000000.0, district.getLat()/10000000000.0); + } + + } + } + mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); + if(caseDtos!=null && caseDtos.size()<5){ + BasicModel.markNoDataRequest(); + } + return mav; + } + + + private List createDealHouseCase(List caseDtos, List dealPrices,int distance, Integer showSource){ if(dealPrices!=null && dealPrices.size()>0){ List ids = new ArrayList(); From 5e4b2e20da2adf4e68a996079cc0bee184349bb4 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Thu, 29 Jan 2026 16:45:35 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E5=87=BA=E7=A7=9F=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/CommercialController.java | 37 +++++++++++++++---- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index 190a1eea4..96ac55875 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -122,9 +122,9 @@ public class CommercialController { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { if (json.containsKey("unitPrice") && json.containsKey("location")) { - + Integer unitPrice = null; if(json.get("unitPrice") != null){ - int unitPrice = (Integer) json.get("unitPrice"); + unitPrice = (Integer) json.get("unitPrice"); int minPrice = (int) (unitPrice - unitPrice * 0.1); model.setMinPrice(minPrice); @@ -142,7 +142,7 @@ public class CommercialController { Double lng = locObj.getDouble("lon"); Double lat = locObj.getDouble("lat"); List houseSelf = dealSampleService.querySampleByLocation(lng, lat, model.getMinPrice(), model.getMaxPrice(), "shop_sell", 5); - List dtos = createSample(houseSelf, "sell", ratio, lng, lat); + List dtos = createSample(houseSelf, "sell", ratio, lng, lat, unitPrice.doubleValue()); mav.setModel(BasicModel.buildOKModel().setResult(dtos)); if(dtos!=null && dtos.size()<5){ BasicModel.markNoDataRequest(); @@ -269,7 +269,7 @@ public class CommercialController { } - private List createSample(List cases, String cat, Double ratio, Double lng, Double lat){ + private List createSample(List cases, String cat, Double ratio, Double lng, Double lat, final Double unitPrice){ if(cases != null && cases.size()>0){ List dtos = new ArrayList(); for(DealSample sample : cases){ @@ -315,6 +315,24 @@ public class CommercialController { dtos.add(dto); } + + if(unitPrice!=null){ + Collections.sort(dtos, new Comparator() { + @Override + public int compare(BusinessCaseDto dto1, BusinessCaseDto dto2) { + double diff1 = Math.abs(dto1.getUnitPrice().doubleValue() - unitPrice); + double diff2 = Math.abs(dto2.getUnitPrice().doubleValue() - unitPrice); + + if (diff1 < diff2) { + return -1; + } else if (diff1 > diff2) { + return 1; + } else { + return 0; + } + } + }); + } return dtos; } return null; @@ -373,8 +391,9 @@ public class CommercialController { Double minPrice = null; Double maxPrice = null; + Double unitPrice = null; if(json.get("unitPrice") != null){ - Double unitPrice = (Double) json.get("unitPrice"); + unitPrice = (Double) json.get("unitPrice"); minPrice = unitPrice - unitPrice * 0.1; maxPrice = unitPrice + unitPrice * 0.1; @@ -389,10 +408,12 @@ public class CommercialController { JSONObject locObj = json.getJSONObject("location"); Double lng = locObj.getDouble("lon"); Double lat = locObj.getDouble("lat"); - List houseSelf = dealSampleService.querySampleByLocation(lng, lat, DataUtil.getDoubleRound(2, minPrice), DataUtil.getDoubleRound(2, maxPrice), "shop_rent", 5); - List dtos = createSample(houseSelf, "rent", ratio, lng, lat); - + List houseSelf = dealSampleService.querySampleByLocation(lng, lat, DataUtil.getDoubleRound(2, minPrice), DataUtil.getDoubleRound(2, maxPrice), "shop_rent", 30); + List dtos = createSample(houseSelf, "rent", ratio, lng, lat, unitPrice); + if(dtos!=null && dtos.size()>5){ + dtos = dtos.subList(0,5); + } mav.setModel(BasicModel.buildOKModel().setResult(dtos)); if(dtos!=null && dtos.size()<5){ BasicModel.markNoDataRequest(); From 2d2bf820ba55c486dd214a8f23b4b47dbc3d144e Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Thu, 29 Jan 2026 19:06:12 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E5=95=86=E9=93=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/CommercialController.java | 46 ++++++++++++------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index 96ac55875..8dcfc974c 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -116,15 +116,18 @@ public class CommercialController { if(mav.model()!=null){ return mav; } - Double ratio = null;//getUserPriceRatio(request); + Double ratio = getUserPriceRatio(request); JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPSELL_EVALUATE); if (json != null) { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { if (json.containsKey("unitPrice") && json.containsKey("location")) { - Integer unitPrice = null; + Double unitPrice = null; if(json.get("unitPrice") != null){ - unitPrice = (Integer) json.get("unitPrice"); + unitPrice = (Double) json.get("unitPrice"); + if(ratio!=null){ + unitPrice = unitPrice * ratio; + } int minPrice = (int) (unitPrice - unitPrice * 0.1); model.setMinPrice(minPrice); @@ -141,12 +144,17 @@ public class CommercialController { JSONObject locObj = json.getJSONObject("location"); Double lng = locObj.getDouble("lon"); Double lat = locObj.getDouble("lat"); - List houseSelf = dealSampleService.querySampleByLocation(lng, lat, model.getMinPrice(), model.getMaxPrice(), "shop_sell", 5); + List houseSelf = dealSampleService.querySampleByLocation(lng, lat, model.getMinPrice(), model.getMaxPrice(), "shop_sell", 30); List dtos = createSample(houseSelf, "sell", ratio, lng, lat, unitPrice.doubleValue()); + + if(dtos!=null && dtos.size()>5){ + dtos = dtos.subList(0,5); + } mav.setModel(BasicModel.buildOKModel().setResult(dtos)); if(dtos!=null && dtos.size()<5){ BasicModel.markNoDataRequest(); } + } } else{ mav.setModel(BasicModel.buildOKModel().setResult(null)); @@ -280,17 +288,17 @@ public class CommercialController { dto.setName(sample.getName()); // dto.setLocation(sample.getString("location")); - if(ratio != null){ - Integer totalPrice = (int)(sample.getTotalPrice().intValue() * ratio); - if(cat.equals("rent")){ - Double dayPrice = totalPrice/(sample.getSize()*30); - dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); - }else{ - Integer avgPrice = BigDecimal.valueOf(totalPrice/sample.getSize()).setScale(0, BigDecimal.ROUND_HALF_UP).intValue(); - dto.setUnitPrice(avgPrice); - } - dto.setTotalPrice(totalPrice); - }else{ +// if(ratio != null){ +// Integer totalPrice = (int)(sample.getTotalPrice().intValue() * ratio); +// if(cat.equals("rent")){ +// Double dayPrice = totalPrice/(sample.getSize()*30); +// dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); +// }else{ +// Integer avgPrice = BigDecimal.valueOf(totalPrice/sample.getSize()).setScale(0, BigDecimal.ROUND_HALF_UP).intValue(); +// dto.setUnitPrice(avgPrice); +// } +// dto.setTotalPrice(totalPrice); +// }else{ if(cat.equals("rent")){ Double dayPrice = sample.getTotalPrice()/(sample.getSize()*30); dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); @@ -298,7 +306,7 @@ public class CommercialController { dto.setUnitPrice(sample.getUnitPrice()); } dto.setTotalPrice(sample.getTotalPrice()); - } +// } dto.setSize(sample.getSize()); if(StringUtils.isNotBlank(sample.getType())){ dto.setEstateType(sample.getType()); @@ -383,7 +391,7 @@ public class CommercialController { if(mav.model()!=null){ return mav; } - Double ratio = null;//getUserPriceRatio(request); + Double ratio = getUserPriceRatio(request); JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPRENT_EVALUATE); if (json != null) { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { @@ -394,6 +402,9 @@ public class CommercialController { Double unitPrice = null; if(json.get("unitPrice") != null){ unitPrice = (Double) json.get("unitPrice"); + if(ratio!=null){ + unitPrice = unitPrice * ratio; + } minPrice = unitPrice - unitPrice * 0.1; maxPrice = unitPrice + unitPrice * 0.1; @@ -409,6 +420,7 @@ public class CommercialController { Double lng = locObj.getDouble("lon"); Double lat = locObj.getDouble("lat"); List houseSelf = dealSampleService.querySampleByLocation(lng, lat, DataUtil.getDoubleRound(2, minPrice), DataUtil.getDoubleRound(2, maxPrice), "shop_rent", 30); + List dtos = createSample(houseSelf, "rent", ratio, lng, lat, unitPrice); if(dtos!=null && dtos.size()>5){ From b710263521e2e292409e7bbe99d33c56f7457dea Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 30 Jan 2026 08:53:09 +0800 Subject: [PATCH 12/14] update --- .../controllers/CommercialController.java | 2 +- .../open/controllers/OfficeController.java | 59 +++++++++---- .../controllers/OfficeSellController.java | 58 +++++++++---- .../open/controllers/PropertyController.java | 85 +++++++++++++------ 4 files changed, 144 insertions(+), 60 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index 8dcfc974c..37d24c31f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -28,7 +28,7 @@ import java.util.*; * * @since 2025/9/16 */ -//@Authority(role = Role.USER) +@Authority(role = Role.USER) public class CommercialController { private static final List GAODE_LEVEL = Arrays.asList("兴趣点", "门牌号", "单元号", "楼层", "房间", "门址", "住宅区","村庄"); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java index dcec0ba44..8b3a40b41 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java @@ -815,7 +815,7 @@ public class OfficeController { } /* 先到CPDB库中查找写字楼 */ District district = null; - Double ratio = null;//getUserPriceRatio(request); + Double ratio = getUserPriceRatio(request); if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())) { district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "office"); @@ -880,10 +880,15 @@ public class OfficeController { pager.setPageSize(50); } } else { - pager.setPageSize(5); + pager.setPageSize(30); } + Double unitPrice = null; if(model.getMinPrice() == null){ + unitPrice = evaluation.getUnitPrice(); + if(ratio != null){ + unitPrice = unitPrice * ratio; + } if(evaluation != null) { minPrice = evaluation.getUnitPrice() - evaluation.getUnitPrice() * 0.1; maxPrice = evaluation.getUnitPrice() + evaluation.getUnitPrice().intValue() * 0.1; @@ -900,8 +905,11 @@ public class OfficeController { Double lng = district.getLng()/10000000000.0; Double lat = district.getLat()/10000000000.0; List houseSelf = dealSampleService.querySampleByLocation(lng, lat, DataUtil.getDoubleRound(2, minPrice), DataUtil.getDoubleRound(2, maxPrice), "office_rent", pager.getPageSize()); - List createBusiness = createSample(houseSelf, "office_rent", district, ratio, lng, lat); + List createBusiness = createSample(houseSelf, "office_rent", district, ratio, lng, lat, unitPrice); + if(createBusiness!=null && createBusiness.size()>5){ + createBusiness = createBusiness.subList(0,5); + } mav.setModel(BasicModel.buildOKModel().setResult(createBusiness)); if(createBusiness!=null && createBusiness.size()<5){ BasicModel.markNoDataRequest(); @@ -1168,7 +1176,7 @@ public class OfficeController { } return null; } - private List createSample(List seawaterDtos, String cat, District district, Double ratio, Double lng, Double lat){ + private List createSample(List seawaterDtos, String cat, District district, Double ratio, Double lng, Double lat, final Double unitPrice){ if(seawaterDtos != null && seawaterDtos.size()>0){ List dtos = new ArrayList(); for(DealSample house : seawaterDtos){ @@ -1178,17 +1186,17 @@ public class OfficeController { dto.setDistrict(house.getDistrict()); dto.setName(house.getName()); - if(ratio != null){ - Integer totalPrice = (int) (house.getTotalPrice()*ratio); - if(cat.equals("office_rent")){ - Double dayPrice = totalPrice/(house.getSize()*30); - dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); - }else{ - Integer avgPrie = (int)(totalPrice/house.getSize()); - dto.setUnitPrice(avgPrie); - } - dto.setTotalPrice(totalPrice); - }else{ +// if(ratio != null){ +// Integer totalPrice = (int) (house.getTotalPrice()*ratio); +// if(cat.equals("office_rent")){ +// Double dayPrice = totalPrice/(house.getSize()*30); +// dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); +// }else{ +// Integer avgPrie = (int)(totalPrice/house.getSize()); +// dto.setUnitPrice(avgPrie); +// } +// dto.setTotalPrice(totalPrice); +// }else{ if(cat.equals("office_rent")){ Double dayPrice = house.getTotalPrice()/(house.getSize()*30); dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); @@ -1197,7 +1205,7 @@ public class OfficeController { } dto.setTotalPrice(house.getTotalPrice()); - } +// } if(StringUtils.isNotBlank(house.getType())){ dto.setEstateType(house.getType()); @@ -1212,6 +1220,25 @@ public class OfficeController { dtos.add(dto); } + + if(unitPrice!=null){ + Collections.sort(dtos, new Comparator() { + @Override + public int compare(BusinessCaseDto dto1, BusinessCaseDto dto2) { + double diff1 = Math.abs(dto1.getUnitPrice().doubleValue() - unitPrice); + double diff2 = Math.abs(dto2.getUnitPrice().doubleValue() - unitPrice); + + if (diff1 < diff2) { + return -1; + } else if (diff1 > diff2) { + return 1; + } else { + return 0; + } + } + }); + } + return dtos; } return null; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java index e4b4f6208..a9d559a20 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java @@ -546,7 +546,7 @@ public class OfficeSellController { return mav; } - Double ratio = null;//getUserPriceRatio(request); + Double ratio = getUserPriceRatio(request); /* 先到CPDB库中查找写字楼 */ District district = null; @@ -615,11 +615,16 @@ public class OfficeSellController { pager.setPageSize(50); } } else { - pager.setPageSize(5); + pager.setPageSize(30); } + Double unitPrice = null; if(model.getMinPrice() == null){ if(evaluation != null) { + unitPrice = evaluation.getUnitPrice(); + if(ratio != null){ + unitPrice = unitPrice * ratio; + } int minPrice = (int) (evaluation.getUnitPrice().intValue() - evaluation.getUnitPrice() * 0.1); model.setMinPrice(minPrice); @@ -638,8 +643,11 @@ public class OfficeSellController { Double lng = district.getLng()/10000000000.0; Double lat = district.getLat()/10000000000.0; List houseSelf = dealSampleService.querySampleByLocation(lng, lat, model.getMinPrice(), model.getMaxPrice(), "office_sell", pager.getPageSize()); - List createBusiness = createSample(houseSelf, "office_sell", district, ratio, lng, lat); + List createBusiness = createSample(houseSelf, "office_sell", district, ratio, lng, lat, unitPrice); + if(createBusiness!=null && createBusiness.size()>5){ + createBusiness = createBusiness.subList(0,5); + } mav.setModel(BasicModel.buildOKModel().setResult(createBusiness)); if(createBusiness !=null && createBusiness.size()<5){ BasicModel.markNoDataRequest(); @@ -880,7 +888,7 @@ public class OfficeSellController { } - private List createSample(List seawaterDtos, String cat, District district, Double ratio, Double lng, Double lat){ + private List createSample(List seawaterDtos, String cat, District district, Double ratio, Double lng, Double lat, final Double unitPrice){ if(seawaterDtos != null && seawaterDtos.size()>0){ List dtos = new ArrayList(); for(DealSample house : seawaterDtos){ @@ -890,17 +898,17 @@ public class OfficeSellController { dto.setDistrict(house.getDistrict()); dto.setName(house.getName()); - if(ratio != null){ - Integer totalPrice = (int) (house.getTotalPrice()*ratio); - if(cat.equals("office_rent")){ - Double dayPrice = totalPrice/(house.getSize()*30); - dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); - }else{ - Integer avgPrie = BigDecimal.valueOf(totalPrice/house.getSize()).setScale(0, BigDecimal.ROUND_HALF_UP).intValue(); - dto.setUnitPrice(avgPrie); - } - dto.setTotalPrice(totalPrice); - }else{ +// if(ratio != null){ +// Integer totalPrice = (int) (house.getTotalPrice()*ratio); +// if(cat.equals("office_rent")){ +// Double dayPrice = totalPrice/(house.getSize()*30); +// dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); +// }else{ +// Integer avgPrie = BigDecimal.valueOf(totalPrice/house.getSize()).setScale(0, BigDecimal.ROUND_HALF_UP).intValue(); +// dto.setUnitPrice(avgPrie); +// } +// dto.setTotalPrice(totalPrice); +// }else{ if(cat.equals("office_rent")){ Double dayPrice = house.getTotalPrice()/(house.getSize()*30); dto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); @@ -909,7 +917,7 @@ public class OfficeSellController { } dto.setTotalPrice(house.getTotalPrice()); - } +// } if(StringUtils.isNotBlank(house.getType())){ dto.setEstateType(house.getType()); @@ -923,6 +931,24 @@ public class OfficeSellController { dto.setCaseDate(DateUtil.formatByPattern(house.getCaseDate(),"yyyy-MM-dd")); dtos.add(dto); } + + if(unitPrice!=null){ + Collections.sort(dtos, new Comparator() { + @Override + public int compare(BusinessCaseDto dto1, BusinessCaseDto dto2) { + double diff1 = Math.abs(dto1.getUnitPrice().doubleValue() - unitPrice); + double diff2 = Math.abs(dto2.getUnitPrice().doubleValue() - unitPrice); + + if (diff1 < diff2) { + return -1; + } else if (diff1 > diff2) { + return 1; + } else { + return 0; + } + } + }); + } return dtos; } return null; 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 d3d1730cb..78d07e5ea 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 @@ -130,7 +130,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); private DistrictService districtService; @@ -6657,18 +6657,21 @@ public class PropertyController { pager.setPageSize(50); } } else { - pager.setPageSize(5); + pager.setPageSize(30); } - Double ratio = null;//getUserPriceRatio(request); + Double ratio = getUserPriceRatio(request); Double minPrice = null; Double maxPrice = null; - + Double avgPrice = null; if(district != null){ if(model.getMinPrice() == null){ SqmetreRent rent = sqmetreRentService.findNearestSqmetreRent(district.getCity(), district.getRegion(), district.getName(), "district"); if(rent != null) { - double avgPrice = DataUtil.getRound(2, rent.getAvgPrice().intValue()/30); + avgPrice = Double.valueOf(DataUtil.getRound(2, rent.getAvgPrice().intValue()/30)); + if(ratio!=null){ + avgPrice = avgPrice * ratio; + } minPrice = avgPrice - avgPrice * 0.1; maxPrice = avgPrice + avgPrice * 0.1; } @@ -6684,11 +6687,14 @@ public class PropertyController { if(caseDtos.size() < pager.getPageSize()){ List houseSelf = dealSampleService.querySampleByLocation(district.getLng()/10000000000.0, district.getLat()/10000000000.0, minPrice, maxPrice, "rent", pager.getPageSize()); if(houseSelf!=null && houseSelf.size()>0){ - caseDtos = createHouseSample(caseDtos, houseSelf, model.getShowSource(), ratio, district.getLng()/10000000000.0, district.getLat()/10000000000.0); + caseDtos = createHouseSample(caseDtos, houseSelf, model.getShowSource(), ratio, district.getLng()/10000000000.0, district.getLat()/10000000000.0, avgPrice); } - } } + + if(caseDtos!=null && caseDtos.size()>5){ + caseDtos = caseDtos.subList(0,5); + } mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); if(caseDtos!=null && caseDtos.size()<5){ BasicModel.markNoDataRequest(); @@ -6769,21 +6775,24 @@ public class PropertyController { pager.setPageSize(50); } } else { - pager.setPageSize(5); + pager.setPageSize(30); } - Double ratio = null;//getUserPriceRatio(request); + Double ratio = getUserPriceRatio(request); Integer minPrice = null; Integer maxPrice = null; - + Double avgPrice = null; if(district != null){ if(model.getMinPrice() == null){ DistrictStatBo statBo = districtStatService.findCurrentDistrictStat(new DistrictKey(district.getCity(), district.getRegion(), district.getName())); if(statBo != null) { - Integer avgPrice = null; + if(StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().equals("别墅")){ - avgPrice = statBo.getVillaDistrictStat().getAvg_price_2b(); + avgPrice = Double.valueOf(statBo.getVillaDistrictStat().getAvg_price_2b()); }else{ - avgPrice = statBo.getDistrictStat().getAvg_price_2b(); + avgPrice = Double.valueOf(statBo.getDistrictStat().getAvg_price_2b()); + } + if(ratio != null){ + avgPrice = avgPrice * ratio; } minPrice = (int)(avgPrice - avgPrice * 0.1); maxPrice = (int)(avgPrice + avgPrice * 0.1); @@ -6800,11 +6809,15 @@ public class PropertyController { if(caseDtos.size() < pager.getPageSize()){ List houseSelf = dealSampleService.querySampleByLocation(district.getLng()/10000000000.0, district.getLat()/10000000000.0, minPrice, maxPrice, "sell", pager.getPageSize()); if(houseSelf!=null && houseSelf.size()>0){ - caseDtos = createHouseSample(caseDtos, houseSelf, model.getShowSource(), ratio, district.getLng()/10000000000.0, district.getLat()/10000000000.0); + caseDtos = createHouseSample(caseDtos, houseSelf, model.getShowSource(), ratio, district.getLng()/10000000000.0, district.getLat()/10000000000.0, avgPrice); } } } + + if(caseDtos!=null && caseDtos.size()>5){ + caseDtos = caseDtos.subList(0,5); + } mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); if(caseDtos!=null && caseDtos.size()<5){ BasicModel.markNoDataRequest(); @@ -6849,7 +6862,7 @@ public class PropertyController { return null; } - private List createHouseSample(List caseDtos, List houses, Integer showSource, Double ratio, Double lng, Double lat){ + private List createHouseSample(List caseDtos, List houses, Integer showSource, Double ratio, Double lng, Double lat,final Double unitPrice){ if (houses != null && !houses.isEmpty()) { Set seenIds = new HashSet(); Iterator iterator = houses.iterator(); @@ -6875,17 +6888,17 @@ public class PropertyController { caseDto.setSize(house.getSize() == null || house.getSize() == 0 ? null : house.getSize()); if(house.getTotalPrice()!=null){ - if(ratio!=null){ - Integer totalPrice = new BigDecimal(house.getTotalPrice() * ratio).setScale(0, BigDecimal.ROUND_HALF_UP).intValue(); - caseDto.setTotalPrice(totalPrice); - if(house.getCat().equals("sell")){ - caseDto.setUnitPrice(new BigDecimal(totalPrice/house.getSize()).setScale(0, BigDecimal.ROUND_HALF_UP).intValue()); - }else if(house.getCat().equals("rent")){ -// Double dayPrice = house.getTotalPrice()/(30*house.getArea()); - Double dayPrice = totalPrice/(30*house.getSize()); - caseDto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); - } - }else{ +// if(ratio!=null){ +// Integer totalPrice = new BigDecimal(house.getTotalPrice() * ratio).setScale(0, BigDecimal.ROUND_HALF_UP).intValue(); +// caseDto.setTotalPrice(totalPrice); +// if(house.getCat().equals("sell")){ +// caseDto.setUnitPrice(new BigDecimal(totalPrice/house.getSize()).setScale(0, BigDecimal.ROUND_HALF_UP).intValue()); +// }else if(house.getCat().equals("rent")){ +//// Double dayPrice = house.getTotalPrice()/(30*house.getArea()); +// Double dayPrice = totalPrice/(30*house.getSize()); +// caseDto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); +// } +// }else{ caseDto.setTotalPrice(house.getTotalPrice() == null || house.getTotalPrice() == 0 ? null : house.getTotalPrice()); if(house.getCat().equals("sell")){ caseDto.setUnitPrice(house.getUnitPrice()); @@ -6893,7 +6906,7 @@ public class PropertyController { Double dayPrice = house.getTotalPrice()/(30*house.getSize()); caseDto.setUnitPrice(DataUtil.getDoubleRound(2, dayPrice)); } - } +// } } caseDto.setDirection(house.getDirection()); caseDto.setDecoration(house.getDecoration()); @@ -6913,6 +6926,24 @@ public class PropertyController { caseDtos.add(caseDto); } } + if(unitPrice!=null){ + Collections.sort(caseDtos, new Comparator() { + @Override + public int compare(HouseCaseDto dto1, HouseCaseDto dto2) { + double diff1 = Math.abs(dto1.getUnitPrice().doubleValue() - unitPrice); + double diff2 = Math.abs(dto2.getUnitPrice().doubleValue() - unitPrice); + + if (diff1 < diff2) { + return -1; + } else if (diff1 > diff2) { + return 1; + } else { + return 0; + } + } + }); + } + } return caseDtos; } From e346591035cc9cd943f2e4ea16d143f536bcbc56 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 30 Jan 2026 12:49:48 +0800 Subject: [PATCH 13/14] update --- .../controllers/CommercialController.java | 2 +- .../open/controllers/PropertyController.java | 101 ++++++++++++------ 2 files changed, 69 insertions(+), 34 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index 37d24c31f..d18b9e9b7 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -124,7 +124,7 @@ public class CommercialController { if (json.containsKey("unitPrice") && json.containsKey("location")) { Double unitPrice = null; if(json.get("unitPrice") != null){ - unitPrice = (Double) json.get("unitPrice"); + unitPrice = Double.valueOf(json.getInt("unitPrice")); if(ratio!=null){ unitPrice = unitPrice * ratio; } 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 78d07e5ea..e78650ab4 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 @@ -1667,10 +1667,18 @@ public class PropertyController { public Object addressEvaluateAction(PropertyEvaluationModel model, HttpServletRequest request) throws IllegalAccessException { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getAddress()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,地址,面积(size)为必填项")); + + if (StringUtils.isBlank(model.getCity()) || model.getSize() <= 0) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,面积(size)为必填项")); return mav; } + + if (StringUtils.isBlank(model.getAddress()) && StringUtils.isBlank(model.getName())) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:地址或名称不为空")); + return mav; + } + + if (model.getDistrict() != null) { //区域编码转房价网区域 FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(model.getDistrict()); @@ -1679,45 +1687,72 @@ public class PropertyController { } } + District district = null; + + if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())){ + district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); + } + boolean villaFlag = DataUtil.isVilla(model.getSize(), model.getName(), model.getHeight(), model.getRoom()); - District district = null; - Map params = new HashMap(); - params.put("city", model.getCity()); - if (StringUtils.isNotBlank(model.getDistrict())) { - params.put("suggestDistrict", model.getDistrict()); - } - params.put("address", model.getAddress()); - if (StringUtils.isNotBlank(model.getName())) { - params.put("suggestName", model.getName()); - } - params.put("category", "district"); - params.put("propertyType", model.getPropertyType()); - String result = addressMatchProxyService.parser(params); - if (result != null) { - JSONObject json = JSONObject.fromObject(result); - if (json.getInt("code") == 200) { - Map map = (Map) json.get("result"); - if ((Integer) map.get("precise") >= 0) { - String propertyType = (String) map.get("propertyType"); - // 优先使用客户的物业类型,即使面积很大也不进行别墅推断 20241111 - String userPropertyTypeParam = model.getPropertyType(); - if (StringUtils.isNotBlank(userPropertyTypeParam) && ("0,2".contains(userPropertyTypeParam))) { - villaFlag = false; - } - if (villaFlag && StringUtils.isNotBlank(propertyType) && !propertyType.equals("别墅")) { - district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name") + "别墅", "district"); - } - if (null == district) { - district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name"), "district"); - } + if(district == null){ + Map params = new HashMap(); + params.put("city", model.getCity()); + if (StringUtils.isNotBlank(model.getDistrict())) { + params.put("suggestDistrict", model.getDistrict()); + } + if(StringUtils.isNotBlank(model.getAddress())){ + params.put("address", model.getAddress()); + }else{ + if (StringUtils.isNotBlank(model.getName())) { + params.put("address", model.getName()); + } + } + if (StringUtils.isNotBlank(model.getName())) { + params.put("suggestName", model.getName()); + } + params.put("category", "district"); + params.put("propertyType", model.getPropertyType()); + String result = addressMatchProxyService.parser(params); + if (result != null) { + JSONObject json = JSONObject.fromObject(result); + if (json.getInt("code") == 200) { + Map map = (Map) json.get("result"); + if ((Integer) map.get("precise") >= 0) { + String propertyType = (String) map.get("propertyType"); + // 优先使用客户的物业类型,即使面积很大也不进行别墅推断 20241111 + String userPropertyTypeParam = model.getPropertyType(); + if (StringUtils.isNotBlank(userPropertyTypeParam) && ("0,2".contains(userPropertyTypeParam))) { + villaFlag = false; + } + if (villaFlag && StringUtils.isNotBlank(propertyType) && !propertyType.equals("别墅")) { + district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name") + "别墅", "district"); + } + if (null == district) { + district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name"), "district"); + } + + } } } } + if (district == null) { //使用新匹配再配一遍,不加类型,有结果,类型为district则走小区估值,其它类型也走经纬度估值 - JSONObject resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), null, false); + JSONObject resultObject = null; + if(StringUtils.isNotBlank(model.getAddress())){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), null, false); + }else{ + if(StringUtils.isNotBlank(model.getName())){ + String addr = model.getName(); + if(StringUtils.isNotBlank(model.getDistrict())){ + addr = model.getDistrict() + addr; + } + resultObject = addressMatchProxyService.newMatch(model.getCity(), addr, null, false); + } + } + if (resultObject != null && resultObject.containsKey("category") && resultObject.get("category")!=null) { if(resultObject.containsKey("id") && resultObject.get("category").equals("district")){ String id = (String) resultObject.get("id"); From 4ccb5e9fff6d1391272a67891716224f4aab1b46 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 30 Jan 2026 14:39:41 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=9F=A5deal=5Fsample=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E5=8A=A0city?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/CommercialController.java | 4 ++-- .../java/com/fangjia/open/controllers/OfficeController.java | 2 +- .../com/fangjia/open/controllers/OfficeSellController.java | 2 +- .../com/fangjia/open/controllers/PropertyController.java | 5 ++--- .../com/fangjia/service/mongo/fangjia/DealSampleService.java | 2 +- .../fangjia/service/mongo/fangjia/DealSampleServiceImpl.java | 3 ++- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index d18b9e9b7..715bf5ae8 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -144,7 +144,7 @@ public class CommercialController { JSONObject locObj = json.getJSONObject("location"); Double lng = locObj.getDouble("lon"); Double lat = locObj.getDouble("lat"); - List houseSelf = dealSampleService.querySampleByLocation(lng, lat, model.getMinPrice(), model.getMaxPrice(), "shop_sell", 30); + List houseSelf = dealSampleService.querySampleByLocation(json.getString("city"), lng, lat, model.getMinPrice(), model.getMaxPrice(), "shop_sell", 30); List dtos = createSample(houseSelf, "sell", ratio, lng, lat, unitPrice.doubleValue()); if(dtos!=null && dtos.size()>5){ @@ -419,7 +419,7 @@ public class CommercialController { JSONObject locObj = json.getJSONObject("location"); Double lng = locObj.getDouble("lon"); Double lat = locObj.getDouble("lat"); - List houseSelf = dealSampleService.querySampleByLocation(lng, lat, DataUtil.getDoubleRound(2, minPrice), DataUtil.getDoubleRound(2, maxPrice), "shop_rent", 30); + List houseSelf = dealSampleService.querySampleByLocation(json.getString("city"), lng, lat, DataUtil.getDoubleRound(2, minPrice), DataUtil.getDoubleRound(2, maxPrice), "shop_rent", 30); List dtos = createSample(houseSelf, "rent", ratio, lng, lat, unitPrice); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java index 8b3a40b41..c9c6ffba1 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java @@ -904,7 +904,7 @@ public class OfficeController { Double lng = district.getLng()/10000000000.0; Double lat = district.getLat()/10000000000.0; - List houseSelf = dealSampleService.querySampleByLocation(lng, lat, DataUtil.getDoubleRound(2, minPrice), DataUtil.getDoubleRound(2, maxPrice), "office_rent", pager.getPageSize()); + List houseSelf = dealSampleService.querySampleByLocation(district.getCity(), lng, lat, DataUtil.getDoubleRound(2, minPrice), DataUtil.getDoubleRound(2, maxPrice), "office_rent", pager.getPageSize()); List createBusiness = createSample(houseSelf, "office_rent", district, ratio, lng, lat, unitPrice); if(createBusiness!=null && createBusiness.size()>5){ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java index a9d559a20..4ee9677f9 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java @@ -642,7 +642,7 @@ public class OfficeSellController { Double lng = district.getLng()/10000000000.0; Double lat = district.getLat()/10000000000.0; - List houseSelf = dealSampleService.querySampleByLocation(lng, lat, model.getMinPrice(), model.getMaxPrice(), "office_sell", pager.getPageSize()); + List houseSelf = dealSampleService.querySampleByLocation(district.getCity(), lng, lat, model.getMinPrice(), model.getMaxPrice(), "office_sell", pager.getPageSize()); List createBusiness = createSample(houseSelf, "office_sell", district, ratio, lng, lat, unitPrice); if(createBusiness!=null && createBusiness.size()>5){ 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 e78650ab4..22a98a662 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 @@ -6720,7 +6720,7 @@ public class PropertyController { } if(caseDtos.size() < pager.getPageSize()){ - List houseSelf = dealSampleService.querySampleByLocation(district.getLng()/10000000000.0, district.getLat()/10000000000.0, minPrice, maxPrice, "rent", pager.getPageSize()); + List houseSelf = dealSampleService.querySampleByLocation(district.getCity(),district.getLng()/10000000000.0, district.getLat()/10000000000.0, minPrice, maxPrice, "rent", pager.getPageSize()); if(houseSelf!=null && houseSelf.size()>0){ caseDtos = createHouseSample(caseDtos, houseSelf, model.getShowSource(), ratio, district.getLng()/10000000000.0, district.getLat()/10000000000.0, avgPrice); } @@ -6842,11 +6842,10 @@ public class PropertyController { } if(caseDtos.size() < pager.getPageSize()){ - List houseSelf = dealSampleService.querySampleByLocation(district.getLng()/10000000000.0, district.getLat()/10000000000.0, minPrice, maxPrice, "sell", pager.getPageSize()); + List houseSelf = dealSampleService.querySampleByLocation(district.getCity(), district.getLng()/10000000000.0, district.getLat()/10000000000.0, minPrice, maxPrice, "sell", pager.getPageSize()); if(houseSelf!=null && houseSelf.size()>0){ caseDtos = createHouseSample(caseDtos, houseSelf, model.getShowSource(), ratio, district.getLng()/10000000000.0, district.getLat()/10000000000.0, avgPrice); } - } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleService.java index 94c928056..a701db466 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleService.java @@ -6,5 +6,5 @@ import scala.math.Numeric; import java.util.List; public interface DealSampleService { - List querySampleByLocation(Double lng, Double lat, Number minPrice, Number maxPrice, String cat, int pageSize); + List querySampleByLocation(String city, Double lng, Double lat, Number minPrice, Number maxPrice, String cat, int pageSize); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleServiceImpl.java index eaa56d9cb..1e125a65d 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealSampleServiceImpl.java @@ -27,7 +27,7 @@ public class DealSampleServiceImpl implements DealSampleService{ } @Override - public List querySampleByLocation(Double lng, Double lat, Number minPrice, Number maxPrice, String cat, int pageSize) { + public List querySampleByLocation(String city, Double lng, Double lat, Number minPrice, Number maxPrice, String cat, int pageSize) { if(lng!=null && lat!=null){ List params = new ArrayList(); BasicDBObject geo = new BasicDBObject(); @@ -37,6 +37,7 @@ public class DealSampleServiceImpl implements DealSampleService{ nearQuery.append("$maxDistance", 3000); geo.append("$near", nearQuery); + params.add(new QueryParam("city", city)); params.add(new QueryParam("cat", cat)); params.add(new QueryParam("location", geo));