From 4ccb5e9fff6d1391272a67891716224f4aab1b46 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 30 Jan 2026 14:39:41 +0800 Subject: [PATCH] =?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));