From c76981e2e26a9d5046f53e93a13e31c5e906613f Mon Sep 17 00:00:00 2001 From: topsun Date: Wed, 10 May 2023 01:21:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=92=8C=E7=BB=88=E7=AB=AF?= =?UTF-8?q?=E5=81=9A=E5=AF=B9=E5=BA=94=E4=BB=A3=E7=A0=81=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- online-taxi-public/service-driver-user/pom.xml | 10 ++++++++++ .../ServiceDriverUserApplication.java | 2 ++ .../remote/ServiceMapClient.java | 15 +++++++++++++++ .../servicedriveruser/service/CarService.java | 13 ++++++++++++- .../servicemap/controller/TerminalController.java | 3 ++- .../taxi/servicemap/remote/TerminalClient.java | 2 +- .../taxi/servicemap/service/TerminalService.java | 3 ++- 7 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/remote/ServiceMapClient.java diff --git a/online-taxi-public/service-driver-user/pom.xml b/online-taxi-public/service-driver-user/pom.xml index 9b90cf7..9182e16 100644 --- a/online-taxi-public/service-driver-user/pom.xml +++ b/online-taxi-public/service-driver-user/pom.xml @@ -45,6 +45,16 @@ freemarker 2.3.28 + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + \ No newline at end of file diff --git a/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/ServiceDriverUserApplication.java b/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/ServiceDriverUserApplication.java index 05c68ee..e610855 100644 --- a/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/ServiceDriverUserApplication.java +++ b/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/ServiceDriverUserApplication.java @@ -3,8 +3,10 @@ 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 { diff --git a/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/remote/ServiceMapClient.java b/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/remote/ServiceMapClient.java new file mode 100644 index 0000000..766aef9 --- /dev/null +++ b/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/remote/ServiceMapClient.java @@ -0,0 +1,15 @@ +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 addTerminal(@RequestParam String name); +} diff --git a/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/service/CarService.java b/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/service/CarService.java index 6deab9a..029a65f 100644 --- a/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/service/CarService.java +++ b/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/service/CarService.java @@ -2,7 +2,9 @@ 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; @@ -13,13 +15,22 @@ 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 responseResult = serviceMapClient.addTerminal(car.getVehicleNo()); + String tid = responseResult.getData().getTid(); + car.setTid(tid); + carMapper.insert(car); + + return ResponseResult.success(); } } diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TerminalController.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TerminalController.java index c78266a..8837fd2 100644 --- a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TerminalController.java +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TerminalController.java @@ -1,6 +1,7 @@ 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; @@ -13,7 +14,7 @@ public class TerminalController { @Autowired TerminalService terminalService; @PostMapping("/addTerminal") - public ResponseResult addTerminal(String name){ + public ResponseResult addTerminal(String name){ return terminalService.addTerminal(name); } diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/remote/TerminalClient.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/remote/TerminalClient.java index 5bdf19d..e1c9506 100644 --- a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/remote/TerminalClient.java +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/remote/TerminalClient.java @@ -33,7 +33,7 @@ public class TerminalClient { * @param name * @return */ - public ResponseResult addTerminal(String name){ + public ResponseResult addTerminal(String name){ //拼接请求的URL StringBuilder url = new StringBuilder(); url.append(AmapConfigConstant.TERMINAL_MAP_ADD_URL); diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/TerminalService.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/TerminalService.java index 336de15..55c2b7e 100644 --- a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/TerminalService.java +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/TerminalService.java @@ -1,6 +1,7 @@ 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; @@ -10,7 +11,7 @@ public class TerminalService { @Autowired TerminalClient terminalClient; - public ResponseResult addTerminal(String name){ + public ResponseResult addTerminal(String name){ return terminalClient.addTerminal(name); } }