diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index f6988d937..8a5b4b5dc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -192,9 +192,9 @@ public class PileStationInfoServiceImpl implements PileStationInfoService { // 数据库保存的是GCJ02坐标,需要转换成天地图使用的WGS84坐标 if (StringUtils.isNotBlank(pileStationInfo.getStationLat()) && StringUtils.isNotBlank(pileStationInfo.getStationLng())) { CoordinateUtil.Coordinate coordinate = CoordinateUtil.gcj02ToWgs84(Double.parseDouble(pileStationInfo.getStationLng()), Double.parseDouble(pileStationInfo.getStationLat())); - vo.setStationLat(String.valueOf(coordinate.getLat())); - vo.setStationLng(String.valueOf(coordinate.getLng())); - log.info("高德坐标:{}, 转天地图坐标:{}", pileStationInfo.getStationLng() + ", " + pileStationInfo.getStationLat(), coordinate.toString()); + vo.setStationLat(String.format("%.6f", coordinate.getLat())); + vo.setStationLng(String.format("%.6f", coordinate.getLng())); + log.info("高德坐标:{}, 转天地图坐标:{}", pileStationInfo.getStationLng() + ", " + pileStationInfo.getStationLat(), vo.getStationLng() + ", " + vo.getStationLat()); } vo.setCountryCode(pileStationInfo.getCountryCode()); @@ -405,14 +405,14 @@ public class PileStationInfoServiceImpl implements PileStationInfoService { } // 2024年8月16日14点15分 天地图坐标转高德坐标 - if (StringUtils.isNotBlank(pileStationInfo.getStationLng()) && StringUtils.isNotBlank(pileStationInfo.getStationLat())) { + String stationLng = pileStationInfo.getStationLng(); + String stationLat = pileStationInfo.getStationLat(); + if (StringUtils.isNotBlank(stationLng) && StringUtils.isNotBlank(stationLat)) { // 获取经纬度 - CoordinateUtil.Coordinate coordinate = CoordinateUtil.wgs84ToGcj02(Double.parseDouble(pileStationInfo.getStationLng()), Double.parseDouble(pileStationInfo.getStationLat())); - if (coordinate != null) { - pileStationInfo.setStationLng(String.valueOf(coordinate.getLng())); - pileStationInfo.setStationLat(String.valueOf(coordinate.getLat())); - log.info("天地图坐标:{}, 转高德坐标:{}", pileStationInfo.getStationLng() + ", " + pileStationInfo.getStationLat(), coordinate.toString()); - } + CoordinateUtil.Coordinate coordinate = CoordinateUtil.wgs84ToGcj02(Double.parseDouble(stationLng), Double.parseDouble(stationLat)); + pileStationInfo.setStationLng(String.format("%.6f", coordinate.getLng())); + pileStationInfo.setStationLat(String.format("%.6f", coordinate.getLat())); + log.info("天地图坐标:{}, 转高德坐标:{}", stationLng + ", " + stationLat, pileStationInfo.getStationLng() + ", " + pileStationInfo.getStationLat()); } pileStationInfo.setUpdateBy(SecurityUtils.getUsername());