From f68de68ceed44cbc5659831093bb67af9541b70f Mon Sep 17 00:00:00 2001 From: majintao Date: Tue, 3 Dec 2024 17:09:38 +0800 Subject: [PATCH] =?UTF-8?q?/house/around=20=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/HouseController.java | 34 ++++++++++++------- .../datastore/RentHouseServiceImpl.java | 2 +- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java index b5966d647..6ff0fc537 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java @@ -901,15 +901,15 @@ public class HouseController { List type2 = Arrays.asList("1", "0"); RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - if (StringUtils.isNotBlank(model.getLocationType()) && !type3.contains(model.getLocationType())){ + if (StringUtils.isNotBlank(model.getLocationType()) && !type3.contains(model.getLocationType())) { mav.setModel(BasicModel.buildBadRequestModel("参数(locationType)有误")); return mav; } - if (StringUtils.isNotBlank(model.getPropertyType()) && !type3.contains(model.getPropertyType())){ + if (StringUtils.isNotBlank(model.getPropertyType()) && !type3.contains(model.getPropertyType())) { mav.setModel(BasicModel.buildBadRequestModel("参数(propertyType)有误")); return mav; } - if (StringUtils.isNotBlank(model.getHouseType()) && !type2.contains(model.getHouseType())){ + if (StringUtils.isNotBlank(model.getHouseType()) && !type2.contains(model.getHouseType())) { mav.setModel(BasicModel.buildBadRequestModel("参数(houseType)有误")); return mav; } @@ -1033,7 +1033,17 @@ public class HouseController { seawater.setPublishDate(formattedDate); } seawater.setDistance(house.getDistance()); - seawater.setLocation(house.getLocation()); + if (StringUtils.isNotBlank(house.getLocation())) { + if ("2".equals(model.getLocationType())) { + String[] split = house.getLocation().split(","); + Double lon = Double.valueOf(split[0]); + Double latt = Double.valueOf(split[1]); + Map toBd09 = GeoUtils.gcj02ToBd09(latt, lon); + seawater.setLocation(toBd09.get("lng") + "," + toBd09.get("lat")); + } else { + seawater.setLocation(house.getLocation()); + } + } houseList.add(seawater); } } @@ -1047,15 +1057,15 @@ public class HouseController { seawater.setDistrict(house.getRegion()); seawater.setAddress(house.getAddress()); seawater.setName(house.getDistrictName()); - seawater.setSize(house.getArea() == 0 ? null : house.getArea()); - seawater.setUnitPrice(house.getAvgPrice() == 0 || house.getAvgPrice() == null ? null : house.getAvgPrice()); - seawater.setTotalPrice(house.getTotalPrice() == 0 ? null : house.getTotalPrice()); + seawater.setSize(house.getArea() == null || house.getArea() == 0 ? null : house.getArea()); + seawater.setUnitPrice(house.getAvgPrice() == null || house.getAvgPrice() == 0 ? null : house.getAvgPrice()); + seawater.setTotalPrice(house.getTotalPrice() == null || house.getTotalPrice() == 0 ? null : house.getTotalPrice()); seawater.setDirection(house.getDirection()); - seawater.setFloor(house.getFloor() == 0 ? null : house.getFloor()); - seawater.setMaxFloor(house.getHeight() == 0 ? null : house.getHeight()); - seawater.setRoom(house.getRoom() == 0 ? null : house.getRoom()); - seawater.setHall(house.getHall() == 0 ? null : house.getHall()); - seawater.setToilet(house.getToilet() == 0 ? null : house.getToilet()); + seawater.setFloor(house.getFloor() == null || house.getFloor() == 0 ? null : house.getFloor()); + seawater.setMaxFloor(house.getHeight() == null || house.getHeight() == 0 ? null : house.getHeight()); + seawater.setRoom(house.getRoom() == null || house.getRoom() == 0 ? null : house.getRoom()); + seawater.setHall(house.getHall() == null || house.getHall() == 0 ? null : house.getHall()); + seawater.setToilet(house.getToilet() == null || house.getToilet() == 0 ? null : house.getToilet()); if (house.getAvgPrice() != null && house.getAvgPrice() != 0) { seawater.setUnitPrice(house.getAvgPrice()); } else { diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/RentHouseServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/RentHouseServiceImpl.java index a065292bb..919351bc0 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/RentHouseServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/RentHouseServiceImpl.java @@ -841,7 +841,7 @@ public class RentHouseServiceImpl implements RentHouseService { // sdQuery.setDistance(String.valueOf(radiusMeters)); params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery)); List sortParams = Arrays.asList(new SortParam("latLng", true)); - List list = houseDao.findAllByParams(params, sortParams, 0, limit); + List list = houseDao.findAllByParams(params, null, 0, limit); return list; }