From e863d3485d077c90988c81a756b37ef21cf4962e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 十一月 2023 20:16:01 +0800
Subject: [PATCH] 后台bug修改

---
 cloud-server-other/src/main/java/com/dsh/other/util/GDMapGeocodingUtil.java |   40 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 38 insertions(+), 2 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 92ac86d..0a68cfc 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
@@ -5,6 +5,7 @@
 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;
 
 
@@ -110,6 +111,7 @@
         JSONObject jsonObject = JSON.parseObject(httpResult.getData());
         Map<String, String> map = new HashMap<>();
 
+
         if(jsonObject.getString("status").equals("1")){
             JSONObject regeocode = jsonObject.getJSONObject("regeocode");
             JSONObject addressComponent = regeocode.getJSONObject("addressComponent");
@@ -126,6 +128,37 @@
             map.put("district", district);
             map.put("districtCode", code);
         }
+        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;
     }
 
@@ -199,11 +232,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