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 67989a7e9..81a281610 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 @@ -880,8 +880,13 @@ public class PropertyController { districtInfoDto.setAddressAlias(district.getAddrAlias()); if (district.getLat2() != null && district.getLat2() != 0 && district.getLng2() != null && district.getLng2() != 0) { - districtInfoDto.setLat(district.getLat2() / 10000000000D); - districtInfoDto.setLng(district.getLng2() / 10000000000D); + districtInfoDto.setLat2(district.getLat2() / 10000000000D); + districtInfoDto.setLng2(district.getLng2() / 10000000000D); + } + if (district.getLat() != null && district.getLat() != 0 && district.getLng() != null + && district.getLng() != 0) { + districtInfoDto.setLat(district.getLat() / 10000000000D); + districtInfoDto.setLng(district.getLng() / 10000000000D); } districtInfoDto.setPropertyType(district.getEstateType2()); if (HouseValidator.validateBuildingType(district.getBuildType())) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java index 6fbca5e08..8d24c760f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java @@ -26,8 +26,14 @@ public class DistrictInfoDto { private List alias; private List addressAlias; private String videoUrl; + //高德坐标 + //维度 private Double lat; + //经度 private Double lng; + // 百度坐标 + private Double lat2; + private Double lng2; private String developer; private String buildType; private String estateCompany; @@ -102,7 +108,22 @@ public class DistrictInfoDto { private String township; private String landProperty; - + public Double getLat2() { + return lat2; + } + + public void setLat2(Double lat2) { + this.lat2 = lat2; + } + + public Double getLng2() { + return lng2; + } + + public void setLng2(Double lng2) { + this.lng2 = lng2; + } + public String getDistrict() { return district; }