From 322c774d86ae15b3ddd084c57057e8a9deda790a Mon Sep 17 00:00:00 2001 From: topsun Date: Thu, 11 May 2023 12:22:36 +0800 Subject: [PATCH] =?UTF-8?q?service-map=E5=9C=B0=E5=9B=BE=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E7=BB=88=E7=AB=AF=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/taxi/servicedriveruser/remote/ServiceMapClient.java | 2 +- .../java/com/taxi/servicedriveruser/service/CarService.java | 3 ++- .../com/taxi/servicemap/controller/TerminalController.java | 4 ++-- .../main/java/com/taxi/servicemap/remote/TerminalClient.java | 4 +++- .../java/com/taxi/servicemap/service/TerminalService.java | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) 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 index 824f730..1b617be 100644 --- 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 @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam; public interface ServiceMapClient { @RequestMapping(method = RequestMethod.POST,value = "/terminal/addTerminal") - ResponseResult addTerminal(@RequestParam String name); + ResponseResult addTerminal(@RequestParam String name,String desc); @RequestMapping(method = RequestMethod.POST,value = "/track/addTrack") ResponseResult addTrack(@RequestParam String tid); 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 3dbbb18..5ece0cc 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 @@ -28,7 +28,8 @@ public class CarService { car.setGmtModified(localDateTime); //获取此车辆终端的tid - ResponseResult responseResult = serviceMapClient.addTerminal(car.getVehicleNo()); + ResponseResult responseResult = serviceMapClient + .addTerminal(car.getVehicleNo(),car.getId()+""); String tid = responseResult.getData().getTid(); car.setTid(tid); 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 8837fd2..d23240d 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 @@ -14,8 +14,8 @@ public class TerminalController { @Autowired TerminalService terminalService; @PostMapping("/addTerminal") - public ResponseResult addTerminal(String name){ - return terminalService.addTerminal(name); + public ResponseResult addTerminal(String name,String desc){ + return terminalService.addTerminal(name,desc); } } 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 e1c9506..ca14ebc 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,String desc){ //拼接请求的URL StringBuilder url = new StringBuilder(); url.append(AmapConfigConstant.TERMINAL_MAP_ADD_URL); @@ -43,6 +43,8 @@ public class TerminalClient { url.append("sid="+sid); url.append("&"); url.append("name="+name); + url.append("&"); + url.append("desc="+desc); ResponseEntity forEntity = restTemplate.postForEntity(url.toString(),null,String.class); 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 55c2b7e..b4ca836 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 @@ -11,7 +11,7 @@ public class TerminalService { @Autowired TerminalClient terminalClient; - public ResponseResult addTerminal(String name){ - return terminalClient.addTerminal(name); + public ResponseResult addTerminal(String name,String desc){ + return terminalClient.addTerminal(name,desc); } }