From d34b3987a7c89c29a74eb7d3525b2a486eeaca10 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 08 一月 2025 17:17:55 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/GaoDeMapUtil.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/GaoDeMapUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/GaoDeMapUtil.java
index 0972c3c..65d978f 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/GaoDeMapUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/GaoDeMapUtil.java
@@ -189,14 +189,18 @@
public static Result<CityInfoVO> getAddressInfo(String address) {
// 返回起始地startAddr与目的地endAddr之间的距离，单位：米
String queryUrl = "https://restapi.amap.com/v3/geocode/geo?address=" + address
- + "&key=" + GAO_DE_KEY;
+ + "&output=json&key=" + GAO_DE_KEY;
String queryResult = getResponse(queryUrl);
GaoDeAddressInfoVO data = JSONObject.parseObject(queryResult, GaoDeAddressInfoVO.class);
List<Geocodes> geocodes = data.getGeocodes();
+ if (geocodes==null||geocodes.isEmpty())
+ return Result.failed(null, "计算失败");
Geocodes info = geocodes.get(0);
String adcode = info.getAdcode();
String city = info.getCity();
- return Result.succeed(new CityInfoVO(city, adcode), "距离计算成功！");
+ String location = info.getLocation();
+ String[] split = location.split(",");
+ return Result.succeed(new CityInfoVO(city, adcode,Double.valueOf(split[0]),Double.valueOf(split[1])), "距离计算成功！");
}
/**
--
Gitblit v1.7.1