online-taxi-public/internal-common/src/main/java/com/internal/contant/AmapConfigConstant.java

@@ -32,8 +32,4 @@ public class AmapConfigConstant {
      * 轨迹点上传
      */
     public static final String POINT_UPLOAD_MAP_ADD_URL = "https://tsapi.amap.com/v1/track/point/upload";
-    /**
-     * 周边搜索终端
-     */
-    public static final String TERMINAL_AROUND_SEARCH_URL = "https://tsapi.amap.com/v1/track/terminal/aroundsearch";
 }

online-taxi-public/internal-common/src/main/java/com/internal/dto/TerminalAroundSearch.java

@@ -1,36 +0,0 @@
-package com.internal.dto;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class TerminalAroundSearch {
-
-    /**
-     *  {
-     *                 "createtime": 1683779426299,
-     *                 "desc": "1656517091884187650",
-     *                 "locatetime": 1683799295000,
-     *                 "location": {
-     *                     "accuracy": 550.0,
-     *                     "direction": 511.0,
-     *                     "distance": 0,
-     *                     "height": null,
-     *                     "latitude": 39.90923,
-     *                     "longitude": 116.397428,
-     *                     "speed": 255.0,
-     *                     "trackProps": null
-     *                 },
-     *                 "name": "京N86555",
-     *                 "props": null,
-     *                 "tid": 686521656
-     *             }
-     */
-
-    private String tid;
-    private Long carId;
-    private String name;
-    private LocalDateTime locatetime;
-    private LocalDateTime createtime;
-}

online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TerminalController.java

@@ -1,7 +1,6 @@
 package com.taxi.servicemap.controller;
 
 import com.internal.dto.ResponseResult;
-import com.internal.dto.TerminalAroundSearch;
 import com.internal.dto.TerminalResponse;
 import com.taxi.servicemap.service.TerminalService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,8 +8,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/terminal")
 public class TerminalController {
@@ -21,10 +18,4 @@ public class TerminalController {
         return terminalService.addTerminal(name,desc);
     }
 
-
-    @PostMapping("/aroundsearch")
-    public ResponseResult<List<TerminalAroundSearch>> aroundsearch(String center, Integer radius){
-        return terminalService.aroundsearch(center,radius);
-    }
-
 }

online-taxi-public/service-map/src/main/java/com/taxi/servicemap/remote/TerminalClient.java

@@ -2,9 +2,8 @@ package com.taxi.servicemap.remote;
 
 import com.internal.contant.AmapConfigConstant;
 import com.internal.dto.ResponseResult;
-import com.internal.dto.TerminalAroundSearch;
+import com.internal.dto.ServiceMapResponse;
 import com.internal.dto.TerminalResponse;
-import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -12,9 +11,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Service
 public class TerminalClient {
     @Value("${amap.key}")
@@ -26,54 +22,15 @@ public class TerminalClient {
     @Autowired
     private RestTemplate restTemplate;
 
-
-    /**
-     * https://lbs.amap.com/api/track/lieying-kaifa/api/terminal_search
-     * 周边搜索终端
-     * @param center
-     * @param radius
-     * @return
-     */
-    public ResponseResult<List<TerminalAroundSearch>> aroundsearch(String center,Integer radius){
-        //拼接请求的URL
-        StringBuilder url = new StringBuilder();
-        url.append(AmapConfigConstant.TERMINAL_AROUND_SEARCH_URL);
-        url.append("?");
-        url.append("key="+amapKey);
-        url.append("&");
-        url.append("sid="+sid);
-        url.append("&");
-        url.append("center="+center);
-        url.append("&");
-        url.append("radius="+radius);
-
-        System.out.println("周边搜索终端URL"+url.toString());
-        ResponseEntity<String> forEntity =
-                restTemplate.postForEntity(url.toString(),null,String.class);
-        String bodyStr = forEntity.getBody();
-        JSONObject result = JSONObject.fromObject(bodyStr);
-        System.out.println("周边搜索终端的结果："+bodyStr);
-        List<TerminalAroundSearch> list = new ArrayList<>();
-        if(result.has("data")){
-            JSONObject data = result.getJSONObject("data");
-            JSONArray jsonArray = data.getJSONArray("results");
-            for (int index = 0 ;index < jsonArray.size();index++){
-                JSONObject jsonObject = jsonArray.getJSONObject(index);
-                TerminalAroundSearch terminalAroundSearch = new TerminalAroundSearch();
-                terminalAroundSearch.setTid(jsonObject.getString("tid"));
-                terminalAroundSearch.setCarId(jsonObject.getLong("desc"));
-                list.add(terminalAroundSearch);
-            }
-            return ResponseResult.success(list);
-        }
-        return ResponseResult.success();
-    }
-
-
     /**
-     *
+     * {
+     *     "code": 1,
+     *     "message": "success",
+     *     "data": {
+     *         "tid": "685651163"
+     *     }
+     * }
      * @param name
-     * @param desc
      * @return
      */
     public ResponseResult<TerminalResponse> addTerminal(String name,String desc){

online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/TerminalService.java

@@ -1,14 +1,11 @@
 package com.taxi.servicemap.service;
 
 import com.internal.dto.ResponseResult;
-import com.internal.dto.TerminalAroundSearch;
 import com.internal.dto.TerminalResponse;
 import com.taxi.servicemap.remote.TerminalClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Service
 public class TerminalService {
     @Autowired
@@ -17,8 +14,4 @@ public class TerminalService {
     public ResponseResult<TerminalResponse> addTerminal(String name,String desc){
         return terminalClient.addTerminal(name,desc);
     }
-
-    public ResponseResult<List<TerminalAroundSearch>> aroundsearch(String center, Integer radius){
-        return terminalClient.aroundsearch(center,radius);
-    }
 }

online-taxi-public/service-map/src/main/resources/application.yaml

@@ -15,5 +15,5 @@ spring:
     name: service-map
 
 amap:
-  key: 01d85ea8f7db65efc370cfec18ff6397
+  key:
   sid: 936137