From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-other/src/main/java/com/dsh/other/util/GDMapGeocodingUtil.java | 97 +++++++++++++++++++++++++++++++++---------------
1 files changed, 66 insertions(+), 31 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/util/GDMapGeocodingUtil.java b/cloud-server-other/src/main/java/com/dsh/other/util/GDMapGeocodingUtil.java
index d25130a..3611668 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/util/GDMapGeocodingUtil.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/util/GDMapGeocodingUtil.java
@@ -3,8 +3,11 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.dsh.other.util.httpClinet.HttpClientUtil;
+import com.dsh.other.util.httpClinet.HttpResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import java.io.BufferedReader;
import java.io.IOException;
@@ -26,31 +29,28 @@
private String key = "fb131ad2dbfb3f39d7d37d244b92aa2d";
- @Autowired
- private HttpClientUtil httpClientUtil;
-
-
/**
* 将行政区域名称转化为坐标
+ *
* @param province
* @param city
* @param county
* @param address
* @return
*/
- public Map<String, Object> geocoding(String province, String city, String county, String address) throws Exception{
+ public Map<String, Object> geocoding(String province, String city, String county, String address) throws Exception {
Map<String, Object> map = new HashMap<>();
- if(ToolUtil.isEmpty(province)){
+ if (ToolUtil.isEmpty(province)) {
map.put("status", -1);
map.put("data", "省不能为空");
return map;
}
- if((ToolUtil.isEmpty(city) && ToolUtil.isNotEmpty(county)) || (ToolUtil.isEmpty(city) && ToolUtil.isNotEmpty(address))){
+ if ((ToolUtil.isEmpty(city) && ToolUtil.isNotEmpty(county)) || (ToolUtil.isEmpty(city) && ToolUtil.isNotEmpty(address))) {
map.put("status", -1);
map.put("data", "市不能为空");
return map;
}
- if((ToolUtil.isEmpty(county) && ToolUtil.isNotEmpty(address))){
+ if ((ToolUtil.isEmpty(county) && ToolUtil.isNotEmpty(address))) {
map.put("status", -1);
map.put("data", "县/区不能为空");
return map;
@@ -58,16 +58,14 @@
String url = "https://restapi.amap.com/v3/geocode/geo?key=" + key + "&output=JSON";
url += "&address=" + province + (ToolUtil.isNotEmpty(city) ? city : "") + (ToolUtil.isNotEmpty(county) ? county : "") + (ToolUtil.isNotEmpty(address) ? address : "");
- HttpResult httpResult = httpClientUtil.pushHttpRequset("GET", url, null, null, "json");
+ HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", url, null, null, "json");
JSONObject jsonObject = JSON.parseObject(httpResult.getData());
String status = jsonObject.getString("status");
List<String> list = new ArrayList<>();
-// gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/geo", "行政区域转经纬度");
-
- if(status.equals("1")){
+ if (status.equals("1")) {
JSONArray geocodes = jsonObject.getJSONArray("geocodes");
- for(int i = 0; i < geocodes.size(); i++){
+ for (int i = 0; i < geocodes.size(); i++) {
String location = geocodes.getJSONObject(i).getString("location");
list.add(location);
}
@@ -78,20 +76,17 @@
}
-
- public Map<String, Object> geocoding(String address) throws Exception{
+ public Map<String, Object> geocoding(String address) throws Exception {
Map<String, Object> map = new HashMap<>();
String url = "https://restapi.amap.com/v3/geocode/geo?key=" + key + "&output=JSON&address=" + address;
- HttpResult httpResult = httpClientUtil.pushHttpRequset("GET", url, null, null, "json");
+ HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", url, null, null, "json");
JSONObject jsonObject = JSON.parseObject(httpResult.getData());
String status = jsonObject.getString("status");
List<String> list = new ArrayList<>();
-// gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/geo", "行政区域转经纬度");
-
- if(status.equals("1")){
+ if (status.equals("1")) {
JSONArray geocodes = jsonObject.getJSONArray("geocodes");
- for(int i = 0; i < geocodes.size(); i++){
+ for (int i = 0; i < geocodes.size(); i++) {
String location = geocodes.getJSONObject(i).getString("location");
list.add(location);
}
@@ -100,25 +95,24 @@
map.put("data", list);
return map;
}
-
/**
* 根据经纬度获取行政区域信息
+ *
* @param lon
* @param lan
* @return
* @throws Exception
*/
- public Map<String, String> geocode(String lon, String lan) throws Exception{
+ public Map<String, String> geocode(String lon, String lan) throws Exception {
String url = "https://restapi.amap.com/v3/geocode/regeo?key=" + key + "&location=" + lon + "," + lan;
- HttpResult httpResult = httpClientUtil.pushHttpRequset("GET", url, null, null, "json");
+ HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", url, null, null, "json");
JSONObject jsonObject = JSON.parseObject(httpResult.getData());
Map<String, String> map = new HashMap<>();
-// gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/regeo", "经纬度转行政区域");
- if(jsonObject.getString("status").equals("1")){
+ if (jsonObject.getString("status").equals("1")) {
JSONObject regeocode = jsonObject.getJSONObject("regeocode");
JSONObject addressComponent = regeocode.getJSONObject("addressComponent");
String address = regeocode.getString("formatted_address");
@@ -127,6 +121,10 @@
String province = addressComponent.getString("province");
String city = addressComponent.getString("city");
String district = addressComponent.getString("district");
+ if("[]".equals(code)){
+ System.err.println("经纬度转行政区划代码失败[" + lon + "," + lan + "]");
+ return null;
+ }
map.put("province", province);
map.put("provinceCode", code.substring(0, 2) + "0000");
map.put("city", city);
@@ -137,24 +135,58 @@
return map;
}
+ @Autowired
+ private GDMapGeocodingUtil gdMapGeocodingUtil;
+
+ public Map<String, String> geocode1(String lon, String lan) throws Exception {
+ String url = "https://restapi.amap.com/v3/geocode/regeo?key=" + key + "&location=" + lon + "," + lan;
+ HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", url, null, null, "json");
+ JSONObject jsonObject = JSON.parseObject(httpResult.getData());
+ Map<String, String> map = new HashMap<>();
+
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(lon, lan);
+ String provinceCode = geocode.get("provinceCode");
+ String cityCode = geocode.get("cityCode");
+ map.put("cityCode", cityCode);
+
+// if(jsonObject.getString("status").equals("1")){
+// JSONObject regeocode = jsonObject.getJSONObject("regeocode");
+// JSONObject addressComponent = regeocode.getJSONObject("addressComponent");
+// String address = regeocode.getString("formatted_address");
+// map.put("address", address);
+// String code = addressComponent.getString("adcode");
+// String province = addressComponent.getString("province");
+// String city = addressComponent.getString("city");
+// String district = addressComponent.getString("district");
+// map.put("province", province);
+// map.put("provinceCode", code.substring(0, 2) + "0000");
+// map.put("city", city);
+// map.put("cityCode", code.substring(0, 4) + "00");
+// map.put("district", district);
+// map.put("districtCode", code);
+// }
+ return map;
+ }
+
/**
* 坐标转换
+ *
* @param locations 经度和纬度用","分割，经度在前，纬度在后，经纬度小数点后不得超过6位。多个坐标对之间用”|”进行分隔最多支持40对坐标。
* @param coordsys 可选值：gps;mapbar;baidu;autonavi(不进行转换)
* @return
* @throws Exception
*/
- public Map<String, String> convert(String locations, String coordsys) throws Exception{
+ public Map<String, String> convert(String locations, String coordsys) throws Exception {
String url = "https://restapi.amap.com/v3/assistant/coordinate/convert?locations=" + locations + "&coordsys=" + coordsys + "&output=json&key=" + key;
- HttpResult httpResult = httpClientUtil.pushHttpRequset("GET", url, null, null, "json");
+ HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", url, null, null, "json");
JSONObject jsonObject = JSON.parseObject(httpResult.getData());
Map<String, String> map = new HashMap<>();
- if("1".equals(jsonObject.getString("status"))){
+ if ("1".equals(jsonObject.getString("status"))) {
map.put("code", jsonObject.getString("infocode"));//"10000"
map.put("info", jsonObject.getString("info"));//status为0时，info返回错误原；否则返回“OK”。
map.put("locations", jsonObject.getString("locations").split(";")[0]);//转换之后的坐标。若有多个坐标，则用 “;”进行区分和间隔
- }else{
+ } else {
map.put("code", jsonObject.getString("infocode"));
map.put("info", jsonObject.getString("info"));//status为0时，info返回错误原；否则返回“OK”。
}
@@ -207,11 +239,14 @@
String queryResult = getResponse(queryUrl);
JSONObject job = JSONObject.parseObject(queryResult);
JSONArray ja = job.getJSONArray("results");
+ if (ja.size() == 0) {
+ return 0.00 + "";
+ }
JSONObject jobO = JSONObject.parseObject(ja.getString(0));
result = Long.parseLong(jobO.get("distance").toString());
- double kilDis = (double) result / 1000;
DecimalFormat decimalFormat = new DecimalFormat("#.00");
- return decimalFormat.format(kilDis);
+ double demo = result / 1000;
+ return decimalFormat.format(demo);
} catch (Exception e) {
throw new RuntimeException();
}
--
Gitblit v1.7.1