Merge branch 'dev-zza' into dev

This commit is contained in:
Lemon
2025-07-01 16:03:57 +08:00

View File

@@ -424,15 +424,18 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
} }
// 2024年8月16日14点15分 天地图坐标转高德坐标 // 2024年8月16日14点15分 天地图坐标转高德坐标
String stationLng = pileStationInfo.getStationLng(); // String stationLng = pileStationInfo.getStationLng();
String stationLat = pileStationInfo.getStationLat(); // String stationLat = pileStationInfo.getStationLat();
if (StringUtils.isNotBlank(stationLng) && StringUtils.isNotBlank(stationLat)) {
// 获取经纬度 // 2025-07-01 存到数据库的经纬度数据不再进行转换,直接入库
CoordinateUtil.Coordinate coordinate = CoordinateUtil.wgs84ToGcj02(Double.parseDouble(stationLng), Double.parseDouble(stationLat));
pileStationInfo.setStationLng(String.format("%.6f", coordinate.getLng())); // if (StringUtils.isNotBlank(stationLng) && StringUtils.isNotBlank(stationLat)) {
pileStationInfo.setStationLat(String.format("%.6f", coordinate.getLat())); // // 获取经纬度
log.info("天地图坐标:{}, 转高德坐标:{}", stationLng + ", " + stationLat, pileStationInfo.getStationLng() + ", " + pileStationInfo.getStationLat()); // 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()); pileStationInfo.setUpdateBy(SecurityUtils.getUsername());
pileStationInfo.setUpdateTime(DateUtils.getNowDate()); pileStationInfo.setUpdateTime(DateUtils.getNowDate());