/house/around 完善

This commit is contained in:
majintao
2024-12-03 17:09:38 +08:00
parent 04e8e1ece3
commit f68de68cee
2 changed files with 23 additions and 13 deletions
@@ -901,15 +901,15 @@ public class HouseController {
List<String> type2 = Arrays.asList("1", "0"); List<String> type2 = Arrays.asList("1", "0");
RestfulModelAndView mav = new RestfulModelAndView(); RestfulModelAndView mav = new RestfulModelAndView();
mav.setViewType("rest"); 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)有误")); mav.setModel(BasicModel.buildBadRequestModel("参数(locationType)有误"));
return mav; 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)有误")); mav.setModel(BasicModel.buildBadRequestModel("参数(propertyType)有误"));
return mav; 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)有误")); mav.setModel(BasicModel.buildBadRequestModel("参数(houseType)有误"));
return mav; return mav;
} }
@@ -1033,7 +1033,17 @@ public class HouseController {
seawater.setPublishDate(formattedDate); seawater.setPublishDate(formattedDate);
} }
seawater.setDistance(house.getDistance()); 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<String, Double> toBd09 = GeoUtils.gcj02ToBd09(latt, lon);
seawater.setLocation(toBd09.get("lng") + "," + toBd09.get("lat"));
} else {
seawater.setLocation(house.getLocation());
}
}
houseList.add(seawater); houseList.add(seawater);
} }
} }
@@ -1047,15 +1057,15 @@ public class HouseController {
seawater.setDistrict(house.getRegion()); seawater.setDistrict(house.getRegion());
seawater.setAddress(house.getAddress()); seawater.setAddress(house.getAddress());
seawater.setName(house.getDistrictName()); seawater.setName(house.getDistrictName());
seawater.setSize(house.getArea() == 0 ? null : house.getArea()); seawater.setSize(house.getArea() == null || house.getArea() == 0 ? null : house.getArea());
seawater.setUnitPrice(house.getAvgPrice() == 0 || house.getAvgPrice() == null ? null : house.getAvgPrice()); seawater.setUnitPrice(house.getAvgPrice() == null || house.getAvgPrice() == 0 ? null : house.getAvgPrice());
seawater.setTotalPrice(house.getTotalPrice() == 0 ? null : house.getTotalPrice()); seawater.setTotalPrice(house.getTotalPrice() == null || house.getTotalPrice() == 0 ? null : house.getTotalPrice());
seawater.setDirection(house.getDirection()); seawater.setDirection(house.getDirection());
seawater.setFloor(house.getFloor() == 0 ? null : house.getFloor()); seawater.setFloor(house.getFloor() == null || house.getFloor() == 0 ? null : house.getFloor());
seawater.setMaxFloor(house.getHeight() == 0 ? null : house.getHeight()); seawater.setMaxFloor(house.getHeight() == null || house.getHeight() == 0 ? null : house.getHeight());
seawater.setRoom(house.getRoom() == 0 ? null : house.getRoom()); seawater.setRoom(house.getRoom() == null || house.getRoom() == 0 ? null : house.getRoom());
seawater.setHall(house.getHall() == 0 ? null : house.getHall()); seawater.setHall(house.getHall() == null || house.getHall() == 0 ? null : house.getHall());
seawater.setToilet(house.getToilet() == 0 ? null : house.getToilet()); seawater.setToilet(house.getToilet() == null || house.getToilet() == 0 ? null : house.getToilet());
if (house.getAvgPrice() != null && house.getAvgPrice() != 0) { if (house.getAvgPrice() != null && house.getAvgPrice() != 0) {
seawater.setUnitPrice(house.getAvgPrice()); seawater.setUnitPrice(house.getAvgPrice());
} else { } else {
@@ -841,7 +841,7 @@ public class RentHouseServiceImpl implements RentHouseService {
// sdQuery.setDistance(String.valueOf(radiusMeters)); // sdQuery.setDistance(String.valueOf(radiusMeters));
params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery)); params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery));
List<SortParam> sortParams = Arrays.asList(new SortParam("latLng", true)); List<SortParam> sortParams = Arrays.asList(new SortParam("latLng", true));
List<House> list = houseDao.findAllByParams(params, sortParams, 0, limit); List<House> list = houseDao.findAllByParams(params, null, 0, limit);
return list; return list;
} }