From ba173949df6bf3f0a5a39e04e8265cd43c9cede4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 19 十一月 2025 14:59:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceCalculator.java |   64 +++++++++++++++++++++++++++++++
 1 files changed, 63 insertions(+), 1 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceCalculator.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceCalculator.java
index 239e1dc..4dc03c7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceCalculator.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceCalculator.java
@@ -22,9 +22,71 @@
     public static void main(String[] args) {
         //118.363428,31.326485
         //118.363312,31.326638
-        System.out.println(calculateDistance(39.326638d,116.363312d,31.326606,118.363272));
+        JkCustomer start = new JkCustomer();
+        start.setId(-1);
+        start.setLongitude(new BigDecimal(118.39));
+        start.setLatitude(new BigDecimal(31.28));
+
+
+        JkCustomer c = new JkCustomer();
+        c.setId(-2);
+        c.setLongitude(new BigDecimal(118.328593));
+        c.setLatitude(new BigDecimal(30.914289));
+        String url="https://restapi.amap.com/v3/direction/driving?origin=${long1},${lat1}&destination=${long2},${lat2}&extensions=basel&key=248ee35dcdfe3f399ffaf12ac4299eca";
+        DistanceCustomerModel dm = DistanceCalculator.calculateDistanceGaode(url,start,c);
+        System.out.println(dm.getDistance());
     }
 
+    public static  DistanceCustomerModel calculateDistanceGaode(String urlStr, JkCustomer c1, JkCustomer c2) {
+        DistanceCustomerModel r =new DistanceCustomerModel();
+        r.setStart(c1);
+        r.setEnd(c2);
+        r.setDistance(0);
+        r.setCode(0);
+        r.setLocations( new ArrayList<>());
+        try {
+            String url  =urlStr.replace("${lat1}", Constants.formatBigdecimalScale(c1.getLatitude(),6)+"")
+                    .replace("${lat2}",Constants.formatBigdecimalScale(c2.getLatitude(),6)+"")
+                    .replace("${long1}",Constants.formatBigdecimalScale(c1.getLongitude(),6)+"")
+                    .replace("${long2}",Constants.formatBigdecimalScale(c2.getLongitude(),6)+"");
+            String result = HttpsUtil.get(url ,true);
+            JSONObject json = JSONObject.parseObject(result);
+            if(json!=null
+                    && json.getInteger("status")!=null
+                    && json.getInteger("status") ==1
+                    && json.getJSONObject("route")!=null
+                    && json.getJSONObject("route").getJSONArray("paths") !=null
+                    && json.getJSONObject("route").getJSONArray("paths") .size()>0 ){
+                JSONArray array = json.getJSONObject("route").getJSONArray("paths");
+                JSONObject model = array.getJSONObject(0);//鍙栫涓�涓�
+               Long distance = Long.parseLong(model.getString("distance"));
+               r.setDistance(distance);
+               JSONArray steps = model.getJSONArray("steps");
+               String tl = "";
+               if(steps!=null && steps.size()>0){
+                   for (int i = 0; i < steps.size(); i++) {
+                       if(StringUtils.isBlank(steps.getJSONObject(i).getString("polyline" ))){
+                           continue;
+                       }
+                       if(!tl.equals("") &&!tl.endsWith(";")){
+                           tl += ";";
+                       }
+                       tl+= steps.getJSONObject(i).getString("polyline" );
+                   }
+               }
+               r.setPolyline(tl);
+               r.setLocations(Arrays.asList(tl.split(";")));
+               r.setCode(1);
+               log.error("鑾峰彇浜ら�氳鍒掔嚎璺俊鎭垚鍔�==============");
+            }else{
+                log.error("鑾峰彇浜ら�氳鍒掔嚎璺俊鎭垚鍔�=====澶辫触锛侊紒========="+c1.getName()+"==="+c2.getName()+result);
+            }
+        }catch (Exception e){
+            log.error("鑾峰彇浜ら�氳鍒掔嚎璺俊鎭垚鍔�=====澶辫触=========="+c1.getName()+"==="+c2.getName());
+        }
+
+        return r ;
+    }
     public static DistanceModel calculateDistanceGaode(String urlStr, JkSketchCustomer c1, JkSketchCustomer c2) {
         DistanceModel r =new DistanceModel();
         r.setStart(c1);

--
Gitblit v1.9.3