From df7b409920210fa920f99516450001827db92ddc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 03 七月 2025 19:06:19 +0800
Subject: [PATCH] bug修改

---
 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java
index 58322c9..12f6dff 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java
@@ -304,11 +304,12 @@
             diu = "B78F99DD-2496-4A43-843B-172CDA2D9798";
         }
         locations = locations + "," + (new Date().getTime() / 1000);
-        String url = "https://restapi.amap.com/v4/geofence/status?key=" + key + "&diu=" + diu + "&locations=" + locations;
+        String url = "https://api.map.baidu.com/directionlite/v1/geofence/status?key=" + key + "&diu=" + diu + "&locations=" + locations;
         String forObject = restTemplate.getForObject(url, String.class);
         JSONObject jsonObject = JSON.parseObject(forObject);
         List<String> ids = new ArrayList<>();
         JSONObject data = jsonObject.getJSONObject("data");
+        System.err.println(data);
         int status = data.getIntValue("status");
         if(0 == status){
             JSONArray fencingEventList = data.getJSONArray("fencing_event_list");
@@ -351,21 +352,24 @@
      * @return
      */
     public Map<String, String> getDistance(String origins, String destination, Integer type){
+
+        String[] split = origins.split(",");
+        String[] split1 = destination.split(",");
+        origins = split[1] + "," + split[0];
+        destination = split1[1] + "," + split1[0];
+
         String url = "https://api.map.baidu.com/directionlite/v1/driving?origin="+origins+"&destination="+destination+"&ak="+key;
         String forObject = restTemplate.getForObject(url, String.class);
         JSONObject jsonObject = JSON.parseObject(forObject);
-        System.err.println("获取距离"+jsonObject);
         String status = jsonObject.getString("status");
 //        gdInterfaceService.saveData("https://restapi.amap.com/v3/distance", "查询两点间的距离");
         if(status.equals("0")){
             JSONObject result = jsonObject.getJSONObject("result");
             JSONArray results = result.getJSONArray("routes");
-            System.err.println("路线数组"+results);
             JSONObject jsonObject1 = results.getJSONObject(0);
             Map<String, String> map = new HashMap<>();
             map.put("distance", jsonObject1.getString("distance"));//距离(米)
             map.put("duration", jsonObject1.getString("duration"));//预计时间(秒)
-            System.err.println("返回map");
             return map;
         }else{
             System.err.println(forObject);
@@ -431,6 +435,5 @@
         }
         return null;
     }
-
 
 }

--
Gitblit v1.7.1