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

@@ -20,8 +20,4 @@ public class AmapConfigConstant {
      * 新增服务
      */
     public static final String SERVICE_MAP_ADD_URL = "https://tsapi.amap.com/v1/track/service/add";
-    /**
-     * 创建终端
-     */
-    public static final String TERMINAL_MAP_ADD_URL = "https://tsapi.amap.com/v1/track/terminal/add";
 }

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

@@ -1,20 +0,0 @@
-package com.internal.dto;
-
-import lombok.Data;
-
-/**
- * {
- *     "data": {
- *         "name": "车辆1",
- *         "tid": 685621293,
- *         "sid": 936178
- *     },
- *     "errcode": 10000,
- *     "errdetail": null,
- *     "errmsg": "OK"
- * }
- */
-@Data
-public class TerminalResponse {
-    private String tid;
-}

online-taxi-public/service-driver-user/pom.xml

@@ -45,16 +45,6 @@
             <artifactId>freemarker</artifactId>
             <version>2.3.28</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/ServiceDriverUserApplication.java

@@ -3,10 +3,8 @@ package com.taxi.servicedriveruser;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication
-@EnableFeignClients
 @MapperScan("com.taxi.servicedriveruser.mapper")
 public class ServiceDriverUserApplication {
 

online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/remote/ServiceMapClient.java

@@ -1,15 +0,0 @@
-package com.taxi.servicedriveruser.remote;
-
-import com.internal.dto.ResponseResult;
-import com.internal.dto.TerminalResponse;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient("service-map")
-public interface ServiceMapClient {
-
-    @RequestMapping(method = RequestMethod.POST,value = "/terminal/addTerminal")
-    ResponseResult<TerminalResponse> addTerminal(@RequestParam String name);
-}

online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/service/CarService.java

@@ -2,9 +2,7 @@ package com.taxi.servicedriveruser.service;
 
 import com.internal.dto.Car;
 import com.internal.dto.ResponseResult;
-import com.internal.dto.TerminalResponse;
 import com.taxi.servicedriveruser.mapper.CarMapper;
-import com.taxi.servicedriveruser.remote.ServiceMapClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,22 +13,13 @@ public class CarService {
 
     @Autowired
     private CarMapper carMapper;
-    @Autowired
+
-    private ServiceMapClient serviceMapClient;
 
     public ResponseResult addCar(Car car) {
         LocalDateTime localDateTime = LocalDateTime.now();
         car.setGmtCreate(localDateTime);
         car.setGmtModified(localDateTime);
-
-        //获取此车辆对应的tid
-        ResponseResult<TerminalResponse> responseResult = serviceMapClient.addTerminal(car.getVehicleNo());
-        String tid = responseResult.getData().getTid();
-        car.setTid(tid);
-
         carMapper.insert(car);
-
-
         return ResponseResult.success();
     }
 }

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

@@ -1,21 +0,0 @@
-package com.taxi.servicemap.controller;
-
-import com.internal.dto.ResponseResult;
-import com.internal.dto.TerminalResponse;
-import com.taxi.servicemap.service.TerminalService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/terminal")
-public class TerminalController {
-    @Autowired
-    TerminalService terminalService;
-    @PostMapping("/addTerminal")
-    public ResponseResult<TerminalResponse> addTerminal(String name){
-        return terminalService.addTerminal(name);
-    }
-
-}

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

@@ -1,73 +0,0 @@
-package com.taxi.servicemap.remote;
-
-import com.internal.contant.AmapConfigConstant;
-import com.internal.dto.ResponseResult;
-import com.internal.dto.ServiceMapResponse;
-import com.internal.dto.TerminalResponse;
-import net.sf.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-@Service
-public class TerminalClient {
-    @Value("${amap.key}")
-    private String amapKey;
-
-    @Value("${amap.sid}")
-    private String sid;
-
-    @Autowired
-    private RestTemplate restTemplate;
-
-    /**
-     * {
-     *     "code": 1,
-     *     "message": "success",
-     *     "data": {
-     *         "tid": "685651163"
-     *     }
-     * }
-     * @param name
-     * @return
-     */
-    public ResponseResult<TerminalResponse> addTerminal(String name){
-        //拼接请求的URL
-        StringBuilder url = new StringBuilder();
-        url.append(AmapConfigConstant.TERMINAL_MAP_ADD_URL);
-        url.append("?");
-        url.append("key="+amapKey);
-        url.append("&");
-        url.append("sid="+sid);
-        url.append("&");
-        url.append("name="+name);
-
-        ResponseEntity<String> forEntity =
-                restTemplate.postForEntity(url.toString(),null,String.class);
-        String bodyStr = forEntity.getBody();
-        JSONObject result = JSONObject.fromObject(bodyStr);
-        TerminalResponse terminalResponse = new TerminalResponse();
-        /**
-         * {
-         *     "data": {
-         *         "name": "车辆1",
-         *         "tid": 685621293,
-         *         "sid": 936178
-         *     },
-         *     "errcode": 10000,
-         *     "errdetail": null,
-         *     "errmsg": "OK"
-         * }
-         */
-        if(result.has("data")){
-            JSONObject data = result.getJSONObject("data");
-            if(data != null && data.has("tid")){
-                String sid = data.getString("tid");
-                terminalResponse.setTid(sid);
-            }
-        }
-        return ResponseResult.success(terminalResponse);
-    }
-}

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

@@ -1,17 +0,0 @@
-package com.taxi.servicemap.service;
-
-import com.internal.dto.ResponseResult;
-import com.internal.dto.TerminalResponse;
-import com.taxi.servicemap.remote.TerminalClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class TerminalService {
-    @Autowired
-    TerminalClient terminalClient;
-
-    public ResponseResult<TerminalResponse> addTerminal(String name){
-        return terminalClient.addTerminal(name);
-    }
-}

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

@@ -16,4 +16,3 @@ spring:
 
 amap:
   key: 01d85ea8f7db65efc370cfec18ff6397
-  sid: 936137

online-taxi-public/service-map/target/classes/application.yaml

@@ -16,4 +16,3 @@ spring:
 
 amap:
   key: 01d85ea8f7db65efc370cfec18ff6397
-  sid: 936137