From fd047fa7234dc11643dab8ecbf38e8d7a8ba0854 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 22 十一月 2025 23:48:12 +0800
Subject: [PATCH] feat:修改任务

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java | 1031 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 1,003 insertions(+), 28 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
index e54c9f9..188657d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
@@ -1,13 +1,17 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.*;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 
-import com.ruoyi.system.domain.DispatchOrd;
-import com.ruoyi.system.domain.TbOrders;
-import com.ruoyi.system.domain.TbVehicleOrder;
-import com.ruoyi.system.service.IDispatchOrdService;
-import com.ruoyi.system.service.ITbOrdersService;
-import com.ruoyi.system.service.ITbVehicleOrderService;
+import com.ruoyi.system.domain.*;
+import com.ruoyi.system.service.*;
+import com.ruoyi.common.config.TencentMapConfig;
+import com.ruoyi.common.config.BaiduMapConfig;
+import com.ruoyi.common.config.TiandituMapConfig;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -24,10 +28,9 @@
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.VehicleGps;
-import com.ruoyi.system.service.IVehicleGpsService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.http.HttpUtils;
 
 /**
  * 杞﹁締GPS鍧愭爣Controller
@@ -47,6 +50,24 @@
     @Autowired
     private ITbOrdersService tbOrdersService;
 
+    @Autowired
+    private IGpsCollectService gpsCollectService;
+
+    @Autowired
+    private IVehicleInfoService vehicleInfoService;
+
+    @Autowired
+    private ICmsGpsCollectService cmsGpsCollectService;
+    
+    @Autowired
+    private TencentMapConfig tencentMapConfig;
+    
+    @Autowired
+    private BaiduMapConfig baiduMapConfig;
+    
+    @Autowired
+    private TiandituMapConfig tiandituMapConfig;
+
    /**
      * 鏌ヨ杞﹁締GPS鍧愭爣鍒楄〃
      */  
@@ -55,7 +76,12 @@
     public TableDataInfo list(VehicleGps vehicleGps) {
 
         startPage();
-        // 璁剧疆鎸夋椂闂村�掑簭鎺掑簭
+//        String vehicleNo=vehicleGps.getVehicleNo();
+//        String beginTime=vehicleGps.getBeginTime();
+//        String endTime=vehicleGps.getEndTime();
+//        return this.getAnonymousTracks(vehicleNo,beginTime,endTime);
+//
+//        // 璁剧疆鎸夋椂闂村�掑簭鎺掑簭
         vehicleGps.setOrderByColumn("collect_time");
         vehicleGps.setIsAsc("desc");
         List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
@@ -92,32 +118,55 @@
                     return getDataTable(new ArrayList<>());
                 }
 
-                Map<String, Object> params = new HashMap<>();
-                params.put("beginTime", dispatchOrd.getDispatchOrdStartDate());
-                params.put("endTime", dispatchOrd.getDispatchOrdUpdateTime());
+                String vehicleNo = tbVehicleOrder.getVehicle();
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                String beginTime= sdf.format(dispatchOrd.getDispatchOrdStartDate());
+                String endTime=  sdf.format(dispatchOrd.getDispatchOrdUpdateTime());
+                //濡傛灉璁㈠崟娌″畬鎴愶紝 endTime涓哄綋鍓嶆椂闂达紱濡備綍璁㈠崟宸茬粡瀹屾垚浜嗭紝鐢ㄨ鍗曠殑缁撴潫鏃堕棿銆�
 
-                vehicleGps.setVehicleNo(tbVehicleOrder.getVehicle());
-                startPage();
-                // 璁剧疆鎸夋椂闂村�掑簭鎺掑簭
-                vehicleGps.setOrderByColumn("collect_time");
-                vehicleGps.setIsAsc("desc");
-                List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
-                return getDataTable(list);
+                return this.getAnonymousTracks(vehicleNo,beginTime,endTime);
+//                Map<String, Object> params = new HashMap<>();
+//                params.put("beginTime", dispatchOrd.getDispatchOrdStartDate());
+//                params.put("endTime", dispatchOrd.getDispatchOrdUpdateTime());
+//
+//                vehicleGps.setVehicleNo(tbVehicleOrder.getVehicle());
+//                startPage();
+//                // 璁剧疆鎸夋椂闂村�掑簭鎺掑簭
+//                vehicleGps.setOrderByColumn("collect_time");
+//                vehicleGps.setIsAsc("desc");
+//                List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
+//                return getDataTable(list);
             }
             catch (Exception ex)
             {
                 logger.error("宸插畬鎴愮殑璁㈠崟鏌ヨ鍦板浘寮傚父锛歿}",ex.getMessage());
                 return getDataTable(new ArrayList<>());
             }
-        }
+        }else{
+            TbOrders tbOrders = tbOrdersService.selectTbOrdersByOrderID(vehicleGps.getOrderId());
+            if (tbOrders == null) {
+                return getDataTable(new ArrayList<>());
+            }
+            DispatchOrd dispatchOrd = dispatchOrdService.selectDispatchOrdByServiceOrdIDDt(tbOrders.getServiceOrdID());
+            if (dispatchOrd == null) {
+                return getDataTable(new ArrayList<>());
+            }
+            String vehicleNo = tbVehicleOrder.getVehicle();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String beginTime= sdf.format(dispatchOrd.getDispatchOrdStartDate());
+            String endTime=  sdf.format(new Date());
 
-        vehicleGps.setVehicleNo(tbVehicleOrder.getVehicle());
-        startPage();
-        // 璁剧疆鎸夋椂闂村�掑簭鎺掑簭
-        vehicleGps.setOrderByColumn("collect_time");
-        vehicleGps.setIsAsc("desc");
-        List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
-        return getDataTable(list);
+            logger.info("鏌ヨ杞﹁締杞ㄨ抗锛氳溅杈嗗彿锛歿}, 寮�濮嬫椂闂达細{}, 缁撴潫鏃堕棿锛歿}", vehicleNo, beginTime, endTime);
+            return this.getAnonymousTracks(vehicleNo,beginTime,endTime);
+//
+//        vehicleGps.setVehicleNo(tbVehicleOrder.getVehicle());
+//        startPage();
+//        // 璁剧疆鎸夋椂闂村�掑簭鎺掑簭
+//        vehicleGps.setOrderByColumn("collect_time");
+//        vehicleGps.setIsAsc("desc");
+//        List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
+//        return getDataTable(list);
+        }
     }
 
     /**
@@ -173,4 +222,930 @@
     public AjaxResult remove(@PathVariable Long[] gpsIds) {
         return toAjax(vehicleGpsService.deleteVehicleGpsByIds(gpsIds));
     }
-} 
\ No newline at end of file
+
+    /**
+     * 鏌ヨ杞﹁締鍘嗗彶杞ㄨ抗
+     */
+    @PreAuthorize("@ss.hasPermi('system:gps:query')")
+    @GetMapping("/tracks")
+    public TableDataInfo getTracks(String vehicleNo, String beginTime, String endTime) {
+        return getAnonymousTracks(vehicleNo, beginTime, endTime);
+    }
+
+   
+    /**
+     * 鍖垮悕鏌ヨ杞﹁締鍘嗗彶杞ㄨ抗
+     */
+    @Anonymous()
+    @GetMapping("/anonymousTracks")
+    public TableDataInfo getAnonymousTracks(String vehicleNo, String beginTime, String endTime) {
+        try {
+            // 閫氳繃杞︾墝鍙疯幏鍙栬澶嘔D
+            VehicleInfo vehicleInfo = vehicleInfoService.selectVehicleInfoByPlateNumber(vehicleNo);
+            if (vehicleInfo == null) {
+
+                // throw new Error("鏈壘鍒拌杞﹁締瀵瑰簲鐨凣PS璁惧");
+                return getDataTable(new ArrayList<>());
+            }
+
+            // 澶勭悊寮�濮嬫椂闂�
+                beginTime = beginTime.replace("T", " ");
+                if (beginTime.split(":").length == 2) { // 鍙湁灏忔椂鍜屽垎閽�
+                    beginTime += ":00";
+                }
+                
+                // 澶勭悊缁撴潫鏃堕棿
+//                endTime = endTime.replace("T", " ").replace(" ","%20");
+            endTime = endTime.replace("T", " ");
+                if (endTime.split(":").length == 2) { // 鍙湁灏忔椂鍜屽垎閽�
+                    endTime += ":59";
+                }
+
+            List<GpsTrackPoint> trackPoints = new ArrayList<>();
+
+            //濡傛灉骞冲彴鏄痗ms锛屽垯璋冪敤cms鐨勬帴鍙�
+            if(vehicleInfo.getPlatformCode().equals("CMS"))
+            {
+                
+                CmsTrackDetailResponse response = cmsGpsCollectService.queryTrackDetail(
+                    vehicleInfo.getDeviceId(),  // 璁惧鍙�
+                    beginTime,                  // 寮�濮嬫椂闂�
+                    endTime,                    // 缁撴潫鏃堕棿
+                    null,                       // 璺濈锛堝彲閫夛級
+                    null,                       // 鍋滆溅鏃堕暱锛堝彲閫夛級
+                    1,                          // 瑙f瀽鍦扮悊浣嶇疆
+                    null,                       // 褰撳墠椤电爜锛堝彲閫夛級
+                    null,                       // 姣忛〉璁板綍鏁帮紙鍙�夛級
+                    2                           // 鍦板浘绫诲瀷锛�2锛氱櫨搴﹀湴鍥撅級
+                );
+
+                if (response.getResult() != 0) {
+                    throw new Error("鏌ヨCMS杞ㄨ抗澶辫触");
+                }
+
+                // 杞崲CMS杞ㄨ抗鐐逛负缁熶竴鏍煎紡
+                if (response.getTracks() != null) {
+                    for (CmsTrackDetailResponse.CmsTrackPoint point : response.getTracks()) {
+                        GpsTrackPoint trackPoint = new GpsTrackPoint();
+                        trackPoint.setVehicleNo(point.getVid());
+                        trackPoint.setDeviceId(point.getId());
+                        
+                        //缁忓害绾害涓虹┖鏃讹紝璺宠繃
+                        if(point.getMlng()==null || point.getMlat()==null)
+                        {
+                            continue;
+                        }
+
+                        // 缁忓害锛屼娇鐢ㄤ笁鍏冭繍绠楃
+                        trackPoint.setLongitude(point.getMlng() != null ? Double.parseDouble(point.getMlng()) : 0.0);
+                        
+                        // 绾害锛屼娇鐢ㄤ笁鍏冭繍绠楃
+                        trackPoint.setLatitude(point.getMlat() != null ? Double.parseDouble(point.getMlat()) : 0.0);
+                        
+                        // 閫熷害锛岀洿鎺ヤ娇鐢╥nt杞琩ouble
+                        trackPoint.setSpeed(point.getSp() > 0 ? (double)point.getSp() : 0.0);
+                        
+                        // 鏂瑰悜锛屼娇鐢ㄤ笁鍏冭繍绠楃澶勭悊
+                        trackPoint.setCourse(point.getFt() > 0 ? point.getFt() : 0);
+                        
+                        // ACC鐘舵�侊紝浣跨敤涓夊厓杩愮畻绗﹀鐞�
+                        trackPoint.setAccStatus(point.getAc() > 0 ? point.getAc() : 0);
+                        
+                        // 鍦ㄧ嚎鐘舵�侊紝浣跨敤涓夊厓杩愮畻绗﹀鐞�
+                        trackPoint.setOnlineStatus(point.getNet() > 0 ? point.getNet() : 0);
+                        trackPoint.setAddress(point.getPs());
+                        
+                        // 涓婃姤鏃堕棿锛岀洿鎺ヤ娇鐢ㄥ瓧绗︿覆
+                        trackPoint.setReportTime(point.getGt() != null ? point.getGt() : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                        
+                        trackPoints.add(trackPoint);
+                    }
+                }
+            }
+            else {
+                
+                // 鏋勫缓鏌ヨ璇锋眰
+                GpsTrackQueryRequest request = new GpsTrackQueryRequest();
+                request.setDeviceid(vehicleInfo.getDeviceId());
+                request.setBegintime(beginTime);
+                request.setEndtime(endTime);
+                request.setTimezone(8); // 涓浗鏃跺尯
+
+                logger.info("鏌ヨ杞﹁締杞ㄨ抗锛氳溅杈嗗彿锛歿}, 璁惧ID锛歿}, 寮�濮嬫椂闂达細{}, 缁撴潫鏃堕棿锛歿}", vehicleNo, vehicleInfo.getDeviceId(), beginTime, endTime);
+                // 鏌ヨ杞ㄨ抗
+                GpsTrackQueryResponse response = gpsCollectService.queryTracks(request);
+                if (response.getStatus() != 0) {
+                    logger.error("鏌ヨ杞ㄨ抗澶辫触锛岀姸鎬佺爜锛歿}, 閿欒淇℃伅锛歿}", response.getStatus(), response.getCause());
+                    throw new Error("鏌ヨ杞ㄨ抗澶辫触锛�" + (response.getCause() != null ? response.getCause() : "鏈煡閿欒"));
+                }
+
+                // 杞崲GPS51杞ㄨ抗鐐逛负缁熶竴鏍煎紡
+                if (response.getRecords() != null) {
+                    for (GpsTrackPoint point : response.getRecords()) {
+                        GpsTrackPoint trackPoint = new GpsTrackPoint();
+                        trackPoint.setVehicleNo(vehicleNo);
+                        trackPoint.setDeviceId(vehicleInfo.getDeviceId());
+                        trackPoint.setLongitude(point.getLongitude());    // 缁忓害
+                        trackPoint.setLatitude(point.getLatitude());    // 绾害
+                        trackPoint.setSpeed(point.getSpeed());      // 閫熷害
+                        trackPoint.setCourse(point.getCourse());    // 鏂瑰悜
+                        trackPoint.setReportTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(point.getUpdatetime()))); // 涓婃姤鏃堕棿
+                        trackPoints.add(trackPoint);
+                    }
+                }
+            }
+            //杞崲鎴怢ist<VehicleGps> 
+            List<VehicleGps> vehicleGpsList = new ArrayList<>();
+            for(GpsTrackPoint trackPoint : trackPoints)
+            {
+                VehicleGps vehicleGps = new VehicleGps();
+                vehicleGps.setVehicleNo(trackPoint.getVehicleNo());
+                vehicleGps.setDeviceId(trackPoint.getDeviceId());
+                vehicleGps.setLongitude(trackPoint.getLongitude());
+                vehicleGps.setLatitude(trackPoint.getLatitude());
+                vehicleGps.setSpeed(trackPoint.getSpeed());
+                //鏂瑰悜
+                vehicleGps.setDirection(Double.valueOf(trackPoint.getCourse()));
+                //鍦板潃
+                vehicleGps.setAddress(trackPoint.getAddress());
+                vehicleGps.setCollectTime(trackPoint.getReportTime());
+                //GPS骞冲彴澶勭悊鏃堕棿
+                vehicleGps.setPlatformProcessTime(trackPoint.getReportTime());
+                vehicleGps.setDeviceReportTime(trackPoint.getReportTime());
+                vehicleGpsList.add(vehicleGps);
+            }
+            //鏃堕棿鍊掑簭鎺掑簭
+            vehicleGpsList.sort(Comparator.comparing(VehicleGps::getDeviceReportTime).reversed());
+            
+            //杩斿洖杞﹁締Gps鍒楄〃
+            return getDataTable(vehicleGpsList);
+            // return success(vehicleGpsList);
+        } catch (Exception e) {
+            logger.error("鏌ヨ杞﹁締杞ㄨ抗寮傚父", e);
+            throw new Error("鏌ヨ杞﹁締杞ㄨ抗澶辫触锛�" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 鑵捐鍦板浘鍦板潃鎼滅储鎺ュ彛浠g悊
+     */
+    @Anonymous()
+    @GetMapping("/address/search")
+    public AjaxResult searchAddress(String keyword, String region) {
+        try {
+            // 鏋勫缓鑵捐鍦板浘鎼滅储API URL
+            String url = "https://apis.map.qq.com/ws/place/v1/search";
+            String params = "keyword=" + URLEncoder.encode(keyword, StandardCharsets.UTF_8.toString()) + 
+                           "&boundary=region(" + (region != null ? region : "骞垮窞") + ")" + 
+                           "&key=" + tencentMapConfig.getKey();
+            
+            // 鍙戦�丠TTP璇锋眰
+            String response = HttpUtils.sendGet(url, params);
+            
+            // 杩斿洖缁撴灉
+            return AjaxResult.success("鏌ヨ鎴愬姛", response);
+        } catch (Exception e) {
+            logger.error("鍦板潃鎼滅储澶辫触", e);
+            return AjaxResult.error("鍦板潃鎼滅储澶辫触锛�" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 鑵捐鍦板浘閫嗗湴鍧�瑙f瀽鎺ュ彛浠g悊
+     */
+    @Anonymous()
+    @GetMapping("/address/geocoder")
+    public AjaxResult reverseGeocoder(Double lat, Double lng) {
+        try {
+            // 妫�鏌ュ弬鏁�
+            logger.info("閫嗗湴鍧�瑙f瀽璇锋眰鍙傛暟: lat={}, lng={}", lat, lng);
+            
+            if (lat == null || lng == null) {
+                logger.warn("鍙傛暟涓嶅畬鏁达紝缂哄皯缁忕含搴﹀潗鏍�: lat={}, lng={}", lat, lng);
+                return AjaxResult.error("鍙傛暟涓嶅畬鏁达紝缂哄皯缁忕含搴﹀潗鏍�");
+            }
+            
+            // 妫�鏌ュ弬鏁版湁鏁堟��
+            if (Double.isNaN(lat) || Double.isNaN(lng) || 
+                Double.isInfinite(lat) || Double.isInfinite(lng)) {
+                logger.warn("鍙傛暟鏃犳晥锛岀粡绾害鍧愭爣鍖呭惈闈炴硶鍊�: lat={}, lng={}", lat, lng);
+                return AjaxResult.error("鍙傛暟鏃犳晥锛岀粡绾害鍧愭爣鏍煎紡閿欒");
+            }
+            
+            // 鏋勫缓鑵捐鍦板浘閫嗗湴鍧�瑙f瀽API URL
+            String url = "https://apis.map.qq.com/ws/geocoder/v1/";
+            String params = "location=" + lat + "," + lng + 
+                           "&key=" + tencentMapConfig.getKey() + 
+                           "&get_poi=1";
+            
+            // 鍙戦�丠TTP璇锋眰
+            String response = HttpUtils.sendGet(url, params);
+            
+            // 杩斿洖缁撴灉
+            return AjaxResult.success("鏌ヨ鎴愬姛", response);
+        } catch (Exception e) {
+            logger.error("閫嗗湴鍧�瑙f瀽澶辫触: lat={}, lng={}", lat, lng, e);
+            return AjaxResult.error("閫嗗湴鍧�瑙f瀽澶辫触锛�" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 鑵捐鍦板浘璺嚎瑙勫垝鎺ュ彛浠g悊锛堣绠椾袱鐐归棿璺濈锛�
+     */
+    @Anonymous()
+    @GetMapping("/route/distance")
+    public AjaxResult calculateDistance(Double fromLat, Double fromLng, Double toLat, Double toLng) {
+        try {
+            // 妫�鏌ュ弬鏁�
+            if (fromLat == null || fromLng == null || toLat == null || toLng == null) {
+                return AjaxResult.error("鍙傛暟涓嶅畬鏁达紝缂哄皯璧风偣鎴栫粓鐐瑰潗鏍�");
+            }
+            
+            // 鏋勫缓鑵捐鍦板浘璺嚎瑙勫垝API URL
+            String url = "https://apis.map.qq.com/ws/distance/v1/";
+            String params = "mode=driving" +
+                           "&from=" + fromLat + "," + fromLng +
+                           "&to=" + toLat + "," + toLng +
+                           "&key=" + tencentMapConfig.getKey();
+            
+            // 鍙戦�丠TTP璇锋眰
+            String response = HttpUtils.sendGet(url, params);
+            
+            // 杩斿洖缁撴灉
+            return AjaxResult.success("璁$畻鎴愬姛", response);
+        } catch (Exception e) {
+            logger.error("璺濈璁$畻澶辫触", e);
+            return AjaxResult.error("璺濈璁$畻澶辫触锛�" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 鐧惧害鍦板浘鍦扮悊缂栫爜鎺ュ彛浠g悊锛堝湴鍧�杞潗鏍囷級
+     */
+    @Anonymous()
+    @GetMapping("/baidu/geocoding")
+    public AjaxResult baiduGeocoding(String address, String city) {
+        try {
+            // 妫�鏌ュ弬鏁�
+            if (address == null || address.trim().isEmpty()) {
+                return AjaxResult.error("鍙傛暟涓嶅畬鏁达紝缂哄皯鍦板潃淇℃伅");
+            }
+            
+            // 鏋勫缓鐧惧害鍦板浘鍦扮悊缂栫爜API URL
+            String url = "https://api.map.baidu.com/geocoding/v3/";
+            String params = "address=" + URLEncoder.encode(address, StandardCharsets.UTF_8.toString()) +
+                           (city != null && !city.trim().isEmpty() ? 
+                            "&city=" + URLEncoder.encode(city, StandardCharsets.UTF_8.toString()) : "") +
+                           "&output=json" +
+                           "&ak=" + baiduMapConfig.getAk();
+            
+            logger.info("鐧惧害鍦板浘鍦扮悊缂栫爜璇锋眰: address={}, city={}", address, city);
+            
+            // 鍙戦�丠TTP璇锋眰
+            String response = HttpUtils.sendGet(url, params);
+            
+            // 杩斿洖缁撴灉
+            return AjaxResult.success("鏌ヨ鎴愬姛", response);
+        } catch (Exception e) {
+            logger.error("鐧惧害鍦板浘鍦扮悊缂栫爜澶辫触", e);
+            return AjaxResult.error("鍦扮悊缂栫爜澶辫触锛�" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 鐧惧害鍦板浘璺嚎瑙勫垝鎺ュ彛浠g悊锛堣绠椾袱涓潗鏍囦箣闂寸殑椹捐溅璺濈锛�
+     */
+    @Anonymous()
+    @GetMapping("/baidu/route/driving")
+    public AjaxResult baiduRouteDriving(String origin, String destination) {
+        try {
+            // 妫�鏌ュ弬鏁�
+            if (origin == null || origin.trim().isEmpty() || 
+                destination == null || destination.trim().isEmpty()) {
+                return AjaxResult.error("鍙傛暟涓嶅畬鏁达紝缂哄皯璧风偣鎴栫粓鐐瑰潗鏍�");
+            }
+            
+            // 楠岃瘉鍧愭爣鏍煎紡锛堢含搴�,缁忓害锛�
+            String[] originParts = origin.split(",");
+            String[] destParts = destination.split(",");
+            if (originParts.length != 2 || destParts.length != 2) {
+                return AjaxResult.error("鍧愭爣鏍煎紡閿欒锛屽簲涓猴細绾害,缁忓害");
+            }
+            
+            // 鏋勫缓鐧惧害鍦板浘璺嚎瑙勫垝API URL
+            String url = "https://api.map.baidu.com/directionlite/v1/driving";
+            String params = "origin=" + origin +
+                           "&destination=" + destination +
+                           "&ak=" + baiduMapConfig.getAk();
+            
+            logger.info("鐧惧害鍦板浘璺嚎瑙勫垝璇锋眰: origin={}, destination={}", origin, destination);
+            
+            // 鍙戦�丠TTP璇锋眰
+            String response = HttpUtils.sendGet(url, params);
+            
+            // 杩斿洖缁撴灉
+            return AjaxResult.success("璁$畻鎴愬姛", response);
+        } catch (Exception e) {
+            logger.error("鐧惧害鍦板浘璺嚎瑙勫垝澶辫触", e);
+            return AjaxResult.error("璺嚎瑙勫垝澶辫触锛�" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 鐧惧害鍦板浘璁$畻涓や釜鍦板潃涔嬮棿鐨勮窛绂伙紙缁勫悎鎺ュ彛锛氬湴鍧�杞潗鏍� + 璺嚎瑙勫垝锛�
+     */
+    @Anonymous()
+    @GetMapping("/baidu/distance/byAddress")
+    public AjaxResult baiduDistanceByAddress(String fromAddress, String fromCity, 
+                                             String toAddress, String toCity) {
+        try {
+            // 妫�鏌ュ弬鏁�
+            if (fromAddress == null || fromAddress.trim().isEmpty() || 
+                toAddress == null || toAddress.trim().isEmpty()) {
+                return AjaxResult.error("鍙傛暟涓嶅畬鏁达紝缂哄皯璧风偣鎴栫粓鐐瑰湴鍧�");
+            }
+            
+            logger.info("寮�濮嬭绠楀湴鍧�璺濈: fromAddress={}, fromCity={}, toAddress={}, toCity={}", 
+                       fromAddress, fromCity, toAddress, toCity);
+            
+            // 绗竴姝ワ細璧风偣鍦板潃杞潗鏍�
+            String geocodingUrl1 = "https://api.map.baidu.com/geocoding/v3/";
+            String geocodingParams1 = "address=" + URLEncoder.encode(fromAddress, StandardCharsets.UTF_8.toString()) +
+                                     (fromCity != null && !fromCity.trim().isEmpty() ? 
+                                      "&city=" + URLEncoder.encode(fromCity, StandardCharsets.UTF_8.toString()) : "") +
+                                     "&output=json" +
+                                     "&ak=" + baiduMapConfig.getAk();
+            
+            String geocodingResponse1 = HttpUtils.sendGet(geocodingUrl1, geocodingParams1);
+            logger.info("璧风偣鍦扮悊缂栫爜鍝嶅簲: {}", geocodingResponse1);
+            
+            // 瑙f瀽璧风偣鍧愭爣
+            com.alibaba.fastjson2.JSONObject geocodingJson1 = com.alibaba.fastjson2.JSONObject.parseObject(geocodingResponse1);
+            if (geocodingJson1.getInteger("status") != 0) {
+                logger.error("璧风偣鍦扮悊缂栫爜澶辫触: {}", geocodingResponse1);
+                return AjaxResult.error("璧风偣鍦板潃瑙f瀽澶辫触");
+            }
+            com.alibaba.fastjson2.JSONObject location1 = geocodingJson1.getJSONObject("result").getJSONObject("location");
+            double fromLat = location1.getDouble("lat");
+            double fromLng = location1.getDouble("lng");
+            logger.info("璧风偣鍧愭爣: lat={}, lng={}", fromLat, fromLng);
+            
+            // 绗簩姝ワ細缁堢偣鍦板潃杞潗鏍�
+            String geocodingUrl2 = "https://api.map.baidu.com/geocoding/v3/";
+            String geocodingParams2 = "address=" + URLEncoder.encode(toAddress, StandardCharsets.UTF_8.toString()) +
+                                     (toCity != null && !toCity.trim().isEmpty() ? 
+                                      "&city=" + URLEncoder.encode(toCity, StandardCharsets.UTF_8.toString()) : "") +
+                                     "&output=json" +
+                                     "&ak=" + baiduMapConfig.getAk();
+            
+            String geocodingResponse2 = HttpUtils.sendGet(geocodingUrl2, geocodingParams2);
+            logger.info("缁堢偣鍦扮悊缂栫爜鍝嶅簲: {}", geocodingResponse2);
+            
+            // 瑙f瀽缁堢偣鍧愭爣
+            com.alibaba.fastjson2.JSONObject geocodingJson2 = com.alibaba.fastjson2.JSONObject.parseObject(geocodingResponse2);
+            if (geocodingJson2.getInteger("status") != 0) {
+                logger.error("缁堢偣鍦扮悊缂栫爜澶辫触: {}", geocodingResponse2);
+                return AjaxResult.error("缁堢偣鍦板潃瑙f瀽澶辫触");
+            }
+            com.alibaba.fastjson2.JSONObject location2 = geocodingJson2.getJSONObject("result").getJSONObject("location");
+            double toLat = location2.getDouble("lat");
+            double toLng = location2.getDouble("lng");
+            logger.info("缁堢偣鍧愭爣: lat={}, lng={}", toLat, toLng);
+            
+            // 绗笁姝ワ細璋冪敤璺嚎瑙勫垝鎺ュ彛璁$畻璺濈
+            String routeUrl = "https://api.map.baidu.com/directionlite/v1/driving";
+            String origin = fromLat + "," + fromLng;
+            String destination = toLat + "," + toLng;
+            String routeParams = "origin=" + origin +
+                                "&destination=" + destination +
+                                "&ak=" + baiduMapConfig.getAk();
+            
+            logger.info("璺嚎瑙勫垝璇锋眰: origin={}, destination={}", origin, destination);
+            String routeResponse = HttpUtils.sendGet(routeUrl, routeParams);
+            logger.info("璺嚎瑙勫垝鍝嶅簲: {}", routeResponse);
+            
+            // 瑙f瀽璺濈缁撴灉
+            com.alibaba.fastjson2.JSONObject routeJson = com.alibaba.fastjson2.JSONObject.parseObject(routeResponse);
+            if (routeJson.getInteger("status") != 0) {
+                logger.error("璺嚎瑙勫垝澶辫触: {}", routeResponse);
+                return AjaxResult.error("璺嚎瑙勫垝澶辫触");
+            }
+            
+            // 鎻愬彇璺濈淇℃伅锛堝崟浣嶏細绫筹級
+            com.alibaba.fastjson2.JSONObject result = routeJson.getJSONObject("result");
+            com.alibaba.fastjson2.JSONArray routes = result.getJSONArray("routes");
+            if (routes == null || routes.isEmpty()) {
+                logger.error("鏈壘鍒拌矾绾夸俊鎭�");
+                return AjaxResult.error("鏈壘鍒拌矾绾夸俊鎭�");
+            }
+            
+            com.alibaba.fastjson2.JSONObject route = routes.getJSONObject(0);
+            int distance = route.getInteger("distance"); // 璺濈锛屽崟浣嶏細绫�
+            int duration = route.getInteger("duration"); // 鏃堕暱锛屽崟浣嶏細绉�
+            
+            logger.info("璁$畻鎴愬姛: 璺濈={}绫�, 鏃堕暱={}绉�", distance, duration);
+            
+            // 鏋勫缓杩斿洖缁撴灉
+            Map<String, Object> resultMap = new HashMap<>();
+            resultMap.put("distance", distance); // 璺濈锛堢背锛�
+            resultMap.put("duration", duration); // 鏃堕暱锛堢锛�
+            resultMap.put("distanceKm", String.format("%.1f", distance / 1000.0)); // 璺濈锛堝叕閲岋級
+            resultMap.put("durationMin", duration / 60); // 鏃堕暱锛堝垎閽燂級
+            
+            // 璧风偣鍧愭爣
+            Map<String, Object> fromLocation = new HashMap<>();
+            fromLocation.put("lat", fromLat);
+            fromLocation.put("lng", fromLng);
+            resultMap.put("fromLocation", fromLocation);
+            
+            // 缁堢偣鍧愭爣
+            Map<String, Object> toLocation = new HashMap<>();
+            toLocation.put("lat", toLat);
+            toLocation.put("lng", toLng);
+            resultMap.put("toLocation", toLocation);
+            
+            return AjaxResult.success("璁$畻鎴愬姛", resultMap);
+        } catch (Exception e) {
+            logger.error("璁$畻鍦板潃璺濈澶辫触", e);
+            return AjaxResult.error("璁$畻璺濈澶辫触锛�" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 鐧惧害鍦板浘鍦板潃鎼滅储鎻愮ずAPI锛堣緭鍏ヨ仈鎯筹級
+     * Place Suggestion API - 鐢ㄤ簬鍦板潃杈撳叆鏃剁殑鏅鸿兘鎻愮ず
+     */
+    @Anonymous()
+    @GetMapping("/baidu/place/suggestion")
+    public AjaxResult baiduPlaceSuggestion(String query, String region) {
+        try {
+            // 妫�鏌ュ弬鏁�
+            if (query == null || query.trim().isEmpty()) {
+                return AjaxResult.error("鍙傛暟涓嶅畬鏁达紝缂哄皯鎼滅储鍏抽敭璇�");
+            }
+            
+            // 鏋勫缓鐧惧害鍦板浘 Place Suggestion API URL
+            String url = "https://api.map.baidu.com/place/v2/suggestion";
+            String params = "query=" + URLEncoder.encode(query, StandardCharsets.UTF_8.toString()) +
+                           (region != null && !region.trim().isEmpty() ? 
+                            "&region=" + URLEncoder.encode(region, StandardCharsets.UTF_8.toString()) : "") +
+                           "&output=json" +
+                           "&ak=" + baiduMapConfig.getAk();
+            
+            logger.info("鐧惧害鍦板浘鍦板潃鎼滅储鎻愮ず璇锋眰: query={}, region={}", query, region);
+            
+            // 鍙戦�丠TTP璇锋眰
+            String response = HttpUtils.sendGet(url, params);
+            logger.debug("鐧惧害鍦板浘鍦板潃鎼滅储鎻愮ず鍝嶅簲: {}", response);
+            
+            // 瑙f瀽鍝嶅簲
+            com.alibaba.fastjson2.JSONObject jsonResponse = com.alibaba.fastjson2.JSONObject.parseObject(response);
+            if (jsonResponse.getInteger("status") != 0) {
+                logger.error("鍦板潃鎼滅储鎻愮ず澶辫触: {}", response);
+                return AjaxResult.error("鍦板潃鎼滅储澶辫触");
+            }
+            
+            // 鎻愬彇鎻愮ず鍒楄〃
+            com.alibaba.fastjson2.JSONArray results = jsonResponse.getJSONArray("result");
+            if (results == null || results.isEmpty()) {
+                logger.info("鏈壘鍒板尮閰嶇殑鍦板潃");
+                return AjaxResult.success("鏌ヨ鎴愬姛", new ArrayList<>());
+            }
+            
+            // 鏋勫缓杩斿洖缁撴灉
+            List<Map<String, Object>> suggestions = new ArrayList<>();
+            for (int i = 0; i < results.size(); i++) {
+                com.alibaba.fastjson2.JSONObject item = results.getJSONObject(i);
+                
+                Map<String, Object> suggestion = new HashMap<>();
+                suggestion.put("name", item.getString("name")); // 鍚嶇О
+                suggestion.put("address", item.getString("address")); // 鍦板潃
+                suggestion.put("province", item.getString("province")); // 鐪�
+                suggestion.put("city", item.getString("city")); // 甯�
+                suggestion.put("district", item.getString("district")); // 鍖�
+                suggestion.put("uid", item.getString("uid")); // 鍦扮偣UID
+                
+                // 缁忕含搴︿俊鎭�
+                com.alibaba.fastjson2.JSONObject location = item.getJSONObject("location");
+                if (location != null) {
+                    Map<String, Object> locationMap = new HashMap<>();
+                    locationMap.put("lat", location.getDouble("lat"));
+                    locationMap.put("lng", location.getDouble("lng"));
+                    suggestion.put("location", locationMap);
+                }
+                
+                suggestions.add(suggestion);
+            }
+            
+            logger.info("鍦板潃鎼滅储鎻愮ず鎴愬姛: 鎵惧埌{}  鏉$粨鏋�", suggestions.size());
+            return AjaxResult.success("鏌ヨ鎴愬姛", suggestions);
+        } catch (Exception e) {
+            logger.error("鍦板潃鎼滅储鎻愮ず澶辫触", e);
+            return AjaxResult.error("鍦板潃鎼滅储澶辫触锛�" + e.getMessage());
+        }
+    }
+    
+    // ==================== 澶╁湴鍥炬帴鍙� ====================
+    
+    /**
+     * 澶╁湴鍥惧湴鐞嗙紪鐮佹帴鍙d唬鐞嗭紙鍦板潃杞潗鏍囷級
+     * 鏂囨。锛歨ttps://lbs.tianditu.gov.cn/server/geocoding.html
+     */
+    @Anonymous()
+    @GetMapping("/tianditu/geocoding")
+    public AjaxResult tiandituGeocoding(String address) {
+        try {
+            // 妫�鏌ュ弬鏁�
+            if (address == null || address.trim().isEmpty()) {
+                return AjaxResult.error("鍙傛暟涓嶅畬鏁达紝缂哄皯鍦板潃淇℃伅");
+            }
+            
+            // 鏋勫缓澶╁湴鍥惧湴鐞嗙紪鐮丄PI URL
+            String url = "http://api.tianditu.gov.cn/geocoder";
+            String params = "ds={\"keyWord\":\"" + address + "\"}&tk=" + tiandituMapConfig.getTk();
+            
+            logger.info("澶╁湴鍥惧湴鐞嗙紪鐮佽姹�: address={}", address);
+            
+            // 鍙戦�丠TTP璇锋眰
+            String response = HttpUtils.sendGet(url, params);
+            
+            // 杩斿洖缁撴灉
+            return AjaxResult.success("鏌ヨ鎴愬姛", response);
+        } catch (Exception e) {
+            logger.error("澶╁湴鍥惧湴鐞嗙紪鐮佸け璐�", e);
+            return AjaxResult.error("鍦扮悊缂栫爜澶辫触锛�" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 澶╁湴鍥鹃�嗗湴鐞嗙紪鐮佹帴鍙d唬鐞嗭紙鍧愭爣杞湴鍧�锛�
+     * 鏂囨。锛歨ttps://lbs.tianditu.gov.cn/server/geocoding.html
+     */
+    @Anonymous()
+    @GetMapping("/tianditu/reverseGeocoding")
+    public AjaxResult tiandituReverseGeocoding(Double lon, Double lat) {
+        try {
+            // 妫�鏌ュ弬鏁�
+            if (lat == null || lon == null) {
+                return AjaxResult.error("鍙傛暟涓嶅畬鏁达紝缂哄皯缁忕含搴﹀潗鏍�");
+            }
+            
+            // 妫�鏌ュ弬鏁版湁鏁堟��
+            if (Double.isNaN(lat) || Double.isNaN(lon) || 
+                Double.isInfinite(lat) || Double.isInfinite(lon)) {
+                return AjaxResult.error("鍙傛暟鏃犳晥锛岀粡绾害鍧愭爣鏍煎紡閿欒");
+            }
+            
+            // 鏋勫缓澶╁湴鍥鹃�嗗湴鐞嗙紪鐮丄PI URL
+            String url = "http://api.tianditu.gov.cn/geocoder";
+            String params = "postStr={\"lon\":" + lon + ",\"lat\":" + lat + ",\"ver\":1}" +
+                           "&type=geocode" +
+                           "&tk=" + tiandituMapConfig.getTk();
+            
+            logger.info("澶╁湴鍥鹃�嗗湴鐞嗙紪鐮佽姹�: lon={}, lat={}", lon, lat);
+            
+            // 鍙戦�丠TTP璇锋眰
+            String response = HttpUtils.sendGet(url, params);
+            
+            // 杩斿洖缁撴灉
+            return AjaxResult.success("鏌ヨ鎴愬姛", response);
+        } catch (Exception e) {
+            logger.error("澶╁湴鍥鹃�嗗湴鐞嗙紪鐮佸け璐�: lon={}, lat={}", lon, lat, e);
+            return AjaxResult.error("閫嗗湴鐞嗙紪鐮佸け璐ワ細" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 澶╁湴鍥惧湴鐐规悳绱㈡帴鍙d唬鐞嗭紙POI鎼滅储锛�
+     * 鏂囨。锛歨ttps://lbs.tianditu.gov.cn/server/search.html
+     */
+    @Anonymous()
+    @GetMapping("/tianditu/place/search")
+    public AjaxResult tiandituPlaceSearch(String keyWord, String queryType, String level, 
+                                          String mapBound, Integer start, Integer count) {
+        try {
+            // 妫�鏌ュ弬鏁�
+            if (keyWord == null || keyWord.trim().isEmpty()) {
+                return AjaxResult.error("鍙傛暟涓嶅畬鏁达紝缂哄皯鎼滅储鍏抽敭璇�");
+            }
+            
+            // 璁剧疆榛樿鍊�
+            if (queryType == null || queryType.trim().isEmpty()) {
+                queryType = "1"; // 1-鏅�氭悳绱紝7-鍛ㄨ竟鎼滅储
+            }
+            if (start == null) {
+                start = 0;
+            }
+            if (count == null) {
+                count = 10;
+            }
+            
+            // 鏋勫缓澶╁湴鍥綪OI鎼滅储API URL
+            String url = "http://api.tianditu.gov.cn/search";
+            StringBuilder paramsBuilder = new StringBuilder();
+            paramsBuilder.append("postStr={\"keyWord\":\"").append(keyWord).append("\"");
+            paramsBuilder.append(",\"queryType\":\"").append(queryType).append("\"");
+            if (level != null && !level.trim().isEmpty()) {
+                paramsBuilder.append(",\"level\":\"").append(level).append("\"");
+            }
+            if (mapBound != null && !mapBound.trim().isEmpty()) {
+                paramsBuilder.append(",\"mapBound\":\"").append(mapBound).append("\"");
+            }
+            paramsBuilder.append(",\"start\":\"").append(start).append("\"");
+            paramsBuilder.append(",\"count\":\"").append(count).append("\"");
+            paramsBuilder.append("}" );
+            paramsBuilder.append("&type=query");
+            paramsBuilder.append("&tk=").append(tiandituMapConfig.getTk());
+            
+            String params = paramsBuilder.toString();
+            
+            logger.info("澶╁湴鍥綪OI鎼滅储璇锋眰: keyWord={}, queryType={}", keyWord, queryType);
+            
+            // 鍙戦�丠TTP璇锋眰
+            String response = HttpUtils.sendGet(url, params);
+            
+            // 杩斿洖缁撴灉
+            return AjaxResult.success("鏌ヨ鎴愬姛", response);
+        } catch (Exception e) {
+            logger.error("澶╁湴鍥綪OI鎼滅储澶辫触", e);
+            return AjaxResult.error("POI鎼滅储澶辫触锛�" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 澶╁湴鍥捐矾绾胯鍒掓帴鍙d唬鐞嗭紙椹捐溅璺緞瑙勫垝锛�
+     * 鏂囨。锛歨ttps://lbs.tianditu.gov.cn/server/drive.html
+     */
+    @Anonymous()
+    @GetMapping("/tianditu/route/driving")
+    public AjaxResult tiandituRouteDriving(String orig, String dest, String mid, String style) {
+        try {
+            // 妫�鏌ュ弬鏁�
+            if (orig == null || orig.trim().isEmpty() || 
+                dest == null || dest.trim().isEmpty()) {
+                return AjaxResult.error("鍙傛暟涓嶅畬鏁达紝缂哄皯璧风偣鎴栫粓鐐瑰潗鏍�");
+            }
+            
+            // 楠岃瘉鍧愭爣鏍煎紡锛堢粡搴�,绾害锛�
+            String[] origParts = orig.split(",");
+            String[] destParts = dest.split(",");
+            if (origParts.length != 2 || destParts.length != 2) {
+                return AjaxResult.error("鍧愭爣鏍煎紡閿欒锛屽簲涓猴細缁忓害,绾害");
+            }
+            
+            // 璁剧疆榛樿鍊�
+            if (style == null || style.trim().isEmpty()) {
+                style = "0"; // 0-鎺ㄨ崘锛�1-閬垮紑楂橀��
+            }
+            
+            // 鏋勫缓澶╁湴鍥鹃┚杞﹁矾寰勮鍒扐PI URL
+            String url = "http://api.tianditu.gov.cn/drive";
+            StringBuilder paramsBuilder = new StringBuilder();
+            paramsBuilder.append("postStr={\"orig\":\"").append(orig).append("\"");
+            paramsBuilder.append(",\"dest\":\"").append(dest).append("\"");
+            if (mid != null && !mid.trim().isEmpty()) {
+                paramsBuilder.append(",\"mid\":\"").append(mid).append("\"");
+            }
+            paramsBuilder.append(",\"style\":\"").append(style).append("\"");
+            paramsBuilder.append("}" );
+            paramsBuilder.append("&tk=").append(tiandituMapConfig.getTk());
+            
+            String params = paramsBuilder.toString();
+            
+            logger.info("澶╁湴鍥鹃┚杞﹁矾寰勮鍒掕姹�: orig={}, dest={}", orig, dest);
+            
+            // 鍙戦�丠TTP璇锋眰
+            String response = HttpUtils.sendGet(url, params);
+            
+            // 杩斿洖缁撴灉
+            return AjaxResult.success("璁$畻鎴愬姛", response);
+        } catch (Exception e) {
+            logger.error("澶╁湴鍥鹃┚杞﹁矾寰勮鍒掑け璐�", e);
+            return AjaxResult.error("璺緞瑙勫垝澶辫触锛�" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 澶╁湴鍥捐绠椾袱涓湴鍧�涔嬮棿鐨勮窛绂伙紙缁勫悎鎺ュ彛锛氬湴鍧�杞潗鏍� + 璺緞瑙勫垝锛�
+     */
+    @Anonymous()
+    @GetMapping("/tianditu/distance/byAddress")
+    public AjaxResult tiandituDistanceByAddress(String fromAddress, String toAddress) {
+        try {
+            // 妫�鏌ュ弬鏁�
+            if (fromAddress == null || fromAddress.trim().isEmpty() || 
+                toAddress == null || toAddress.trim().isEmpty()) {
+                return AjaxResult.error("鍙傛暟涓嶅畬鏁达紝缂哄皯璧风偣鎴栫粓鐐瑰湴鍧�");
+            }
+            
+            logger.info("寮�濮嬭绠楀湴鍧�璺濈: fromAddress={}, toAddress={}", fromAddress, toAddress);
+            
+            // 绗竴姝ワ細璧风偣鍦板潃杞潗鏍�
+            String geocodingUrl1 = "http://api.tianditu.gov.cn/geocoder";
+            String geocodingParams1 = "ds={\"keyWord\":\"" + fromAddress + "\"}" +
+                                     "&tk=" + tiandituMapConfig.getTk();
+            
+            String geocodingResponse1 = HttpUtils.sendGet(geocodingUrl1, geocodingParams1);
+            logger.info("璧风偣鍦扮悊缂栫爜鍝嶅簲: {}", geocodingResponse1);
+            
+            // 瑙f瀽璧风偣鍧愭爣
+            com.alibaba.fastjson2.JSONObject geocodingJson1 = com.alibaba.fastjson2.JSONObject.parseObject(geocodingResponse1);
+            if (!"0".equals(geocodingJson1.getString("status"))) {
+                logger.error("璧风偣鍦扮悊缂栫爜澶辫触: {}", geocodingResponse1);
+                return AjaxResult.error("璧风偣鍦板潃瑙f瀽澶辫触");
+            }
+            com.alibaba.fastjson2.JSONObject location1 = geocodingJson1.getJSONObject("location");
+            if (location1 == null) {
+                return AjaxResult.error("璧风偣鍦板潃鏈壘鍒板搴斿潗鏍�");
+            }
+            double fromLon = location1.getDouble("lon");
+            double fromLat = location1.getDouble("lat");
+            logger.info("璧风偣鍧愭爣: lon={}, lat={}", fromLon, fromLat);
+            
+            // 绗簩姝ワ細缁堢偣鍦板潃杞潗鏍�
+            String geocodingUrl2 = "http://api.tianditu.gov.cn/geocoder";
+            String geocodingParams2 = "ds={\"keyWord\":\"" + toAddress + "\"}" +
+                                     "&tk=" + tiandituMapConfig.getTk();
+            
+            String geocodingResponse2 = HttpUtils.sendGet(geocodingUrl2, geocodingParams2);
+            logger.info("缁堢偣鍦扮悊缂栫爜鍝嶅簲: {}", geocodingResponse2);
+            
+            // 瑙f瀽缁堢偣鍧愭爣
+            com.alibaba.fastjson2.JSONObject geocodingJson2 = com.alibaba.fastjson2.JSONObject.parseObject(geocodingResponse2);
+            if (!"0".equals(geocodingJson2.getString("status"))) {
+                logger.error("缁堢偣鍦扮悊缂栫爜澶辫触: {}", geocodingResponse2);
+                return AjaxResult.error("缁堢偣鍦板潃瑙f瀽澶辫触");
+            }
+            com.alibaba.fastjson2.JSONObject location2 = geocodingJson2.getJSONObject("location");
+            if (location2 == null) {
+                return AjaxResult.error("缁堢偣鍦板潃鏈壘鍒板搴斿潗鏍�");
+            }
+            double toLon = location2.getDouble("lon");
+            double toLat = location2.getDouble("lat");
+            logger.info("缁堢偣鍧愭爣: lon={}, lat={}", toLon, toLat);
+            
+            // 绗笁姝ワ細璋冪敤璺緞瑙勫垝鎺ュ彛璁$畻璺濈
+            String routeUrl = "http://api.tianditu.gov.cn/drive";
+            String orig = fromLon + "," + fromLat;
+            String dest = toLon + "," + toLat;
+            String routeParams = "postStr={\"orig\":\"" + orig + "\",\"dest\":\"" + dest + "\",\"style\":\"0\"}" +
+                                "&tk=" + tiandituMapConfig.getTk();
+            
+            logger.info("璺緞瑙勫垝璇锋眰: orig={}, dest={}", orig, dest);
+            String routeResponse = HttpUtils.sendGet(routeUrl, routeParams);
+            logger.info("璺緞瑙勫垝鍝嶅簲: {}", routeResponse);
+            
+            // 瑙f瀽璺濈缁撴灉
+            com.alibaba.fastjson2.JSONObject routeJson = com.alibaba.fastjson2.JSONObject.parseObject(routeResponse);
+            if (!"0".equals(routeJson.getString("status"))) {
+                logger.error("璺緞瑙勫垝澶辫触: {}", routeResponse);
+                return AjaxResult.error("璺緞瑙勫垝澶辫触");
+            }
+            
+            // 鎻愬彇璺濈淇℃伅
+            com.alibaba.fastjson2.JSONObject result = routeJson.getJSONObject("result");
+            if (result == null) {
+                logger.error("璺緞瑙勫垝缁撴灉涓虹┖");
+                return AjaxResult.error("璺緞瑙勫垝澶辫触");
+            }
+            
+            com.alibaba.fastjson2.JSONArray routes = result.getJSONArray("routes");
+            if (routes == null || routes.isEmpty()) {
+                logger.error("鏈壘鍒拌矾绾夸俊鎭�");
+                return AjaxResult.error("鏈壘鍒拌矾绾夸俊鎭�");
+            }
+            
+            com.alibaba.fastjson2.JSONObject route = routes.getJSONObject(0);
+            double distance = route.getDoubleValue("distance"); // 璺濈锛屽崟浣嶏細绫�
+            double duration = route.getDoubleValue("duration"); // 鏃堕暱锛屽崟浣嶏細绉�
+            
+            logger.info("璁$畻鎴愬姛: 璺濈={}绫�, 鏃堕暱={}绉�", distance, duration);
+            
+            // 鏋勫缓杩斿洖缁撴灉
+            Map<String, Object> resultMap = new HashMap<>();
+            resultMap.put("distance", (int)distance); // 璺濈锛堢背锛�
+            resultMap.put("duration", (int)duration); // 鏃堕暱锛堢锛�
+            resultMap.put("distanceKm", String.format("%.1f", distance / 1000.0)); // 璺濈锛堝叕閲岋級
+            resultMap.put("durationMin", (int)(duration / 60)); // 鏃堕暱锛堝垎閽燂級
+            
+            // 璧风偣鍧愭爣
+            Map<String, Object> fromLocation = new HashMap<>();
+            fromLocation.put("lon", fromLon);
+            fromLocation.put("lat", fromLat);
+            resultMap.put("fromLocation", fromLocation);
+            
+            // 缁堢偣鍧愭爣
+            Map<String, Object> toLocation = new HashMap<>();
+            toLocation.put("lon", toLon);
+            toLocation.put("lat", toLat);
+            resultMap.put("toLocation", toLocation);
+            
+            return AjaxResult.success("璁$畻鎴愬姛", resultMap);
+        } catch (Exception e) {
+            logger.error("璁$畻鍦板潃璺濈澶辫触", e);
+            return AjaxResult.error("璁$畻璺濈澶辫触锛�" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 澶╁湴鍥捐緭鍏ユ彁绀烘帴鍙d唬鐞嗭紙鍦板潃鑱旀兂锛�
+     * 鏂囨。锛歨ttps://lbs.tianditu.gov.cn/server/suggestion.html
+     */
+    @Anonymous()
+    @GetMapping("/tianditu/place/suggestion")
+    public AjaxResult tiandituPlaceSuggestion(String keyWord, String region, String city, Integer count) {
+        try {
+            // 妫�鏌ュ繀闇�鍙傛暟
+            if (keyWord == null || keyWord.trim().isEmpty()) {
+                return AjaxResult.error("鍙傛暟涓嶅畬鏁达紝缂哄皯鎼滅储鍏抽敭璇�(keyWord)");
+            }
+            
+            // 璁剧疆榛樿鍊�
+            if (count == null) {
+                count = 10;
+            }
+            
+            // 鏋勫缓澶╁湴鍥炬櫘閫氭悳绱PI URL
+            String url = "http://api.tianditu.gov.cn/v2/search";
+            StringBuilder paramsBuilder = new StringBuilder();
+            paramsBuilder.append("postStr={\"keyWord\":\"").append(keyWord).append("\"");
+            // 纭紪鐮佷腑鍥藉湴鍥捐寖鍥�
+            paramsBuilder.append(",\"mapBound\":\"").append("73.66,3.86,135.05,53.55").append("\"");
+            // 榛樿绾у埆涓�18
+            paramsBuilder.append(",\"level\":\"").append("18").append("\"");
+            // 榛樿鏌ヨ绫诲瀷涓烘櫘閫氭悳绱�
+            paramsBuilder.append(",\"queryType\":\"").append("1").append("\"");
+            // 榛樿璧峰浣嶇疆涓�0
+            paramsBuilder.append(",\"start\":\"").append("0").append("\"");
+            paramsBuilder.append(",\"count\":\"").append(count).append("\"");
+            
+            // 娣诲姞鍙�夊弬鏁�
+            if (region != null && !region.trim().isEmpty()) {
+                paramsBuilder.append(",\"specify\":\"").append(region).append("\"");
+            }
+            if (city != null && !city.trim().isEmpty()) {
+                paramsBuilder.append(",\"dataTypes\":\"").append(city).append("\"");
+            }
+            
+            paramsBuilder.append("}");
+            paramsBuilder.append("&type=query");
+            paramsBuilder.append("&tk=").append(tiandituMapConfig.getTk());
+            
+            String params = paramsBuilder.toString();
+            
+            logger.info("澶╁湴鍥炬櫘閫氭悳绱㈣姹�: keyWord={}, count={}", keyWord, count);
+            logger.debug("鍦板浘璇锋眰鎺ュ彛鍙傛暟锛歿}", params);
+            
+            // 鍙戦�丠TTP璇锋眰
+            String response = HttpUtils.sendGet(url, params);
+            logger.debug("澶╁湴鍥炬櫘閫氭悳绱㈠搷搴�: {}", response);
+            
+            // 瑙f瀽鍝嶅簲
+            com.alibaba.fastjson2.JSONObject jsonResponse = com.alibaba.fastjson2.JSONObject.parseObject(response);
+            if (!"0".equals(jsonResponse.getString("status"))) {
+                logger.error("鏅�氭悳绱㈠け璐�: {}", response);
+                return AjaxResult.error("鍦板潃鎼滅储澶辫触");
+            }
+            
+            // 鎻愬彇鎼滅储缁撴灉
+            com.alibaba.fastjson2.JSONArray results = jsonResponse.getJSONArray("pois");
+            if (results == null || results.isEmpty()) {
+                logger.info("鏈壘鍒板尮閰嶇殑鍦板潃");
+                return AjaxResult.success("鏌ヨ鎴愬姛", new ArrayList<>());
+            }
+            
+            // 鏋勫缓杩斿洖缁撴灉
+            List<Map<String, Object>> suggestions = new ArrayList<>();
+            for (int i = 0; i < results.size(); i++) {
+                com.alibaba.fastjson2.JSONObject item = results.getJSONObject(i);
+                
+                Map<String, Object> suggestion = new HashMap<>();
+                suggestion.put("name", item.getString("name")); // 鍚嶇О
+                suggestion.put("address", item.getString("addr")); // 鍦板潃
+                suggestion.put("province", item.getString("prov")); // 鐪�
+                suggestion.put("city", item.getString("city")); // 甯�
+                suggestion.put("district", item.getString("county")); // 鍖哄幙
+                suggestion.put("tel", item.getString("tel")); // 鐢佃瘽
+                suggestion.put("postcode", item.getString("postcode")); // 閭紪
+                suggestion.put("type", item.getString("type")); // 绫诲瀷
+                
+                // 缁忕含搴︿俊鎭�
+                com.alibaba.fastjson2.JSONObject location = item.getJSONObject("lonlat");
+                if (location != null) {
+                    Map<String, Object> locationMap = new HashMap<>();
+                    locationMap.put("lon", location.getDouble("lon"));
+                    locationMap.put("lat", location.getDouble("lat"));
+                    suggestion.put("location", locationMap);
+                }
+                
+                suggestions.add(suggestion);
+            }
+            
+            logger.info("鍦板潃鎼滅储鎴愬姛: 鎵惧埌{}鏉$粨鏋�", suggestions.size());
+            return AjaxResult.success("鏌ヨ鎴愬姛", suggestions);
+        } catch (Exception e) {
+            logger.error("鍦板潃鎼滅储澶辫触", e);
+            return AjaxResult.error("鍦板潃鎼滅储澶辫触锛�" + e.getMessage());
+        }
+    }
+}
\ No newline at end of file

--
Gitblit v1.9.1