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 766aef9..824f730 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 @@ -2,6 +2,7 @@ package com.taxi.servicedriveruser.remote; import com.internal.dto.ResponseResult; import com.internal.dto.TerminalResponse; +import com.internal.dto.TrackResponse; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -12,4 +13,7 @@ public interface ServiceMapClient { @RequestMapping(method = RequestMethod.POST,value = "/terminal/addTerminal") ResponseResult addTerminal(@RequestParam String name); + + @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 233c27f..5d860fe 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 @@ -3,6 +3,7 @@ package com.taxi.servicedriveruser.service; import com.internal.dto.Car; import com.internal.dto.ResponseResult; import com.internal.dto.TerminalResponse; +import com.internal.dto.TrackResponse; import com.taxi.servicedriveruser.mapper.CarMapper; import com.taxi.servicedriveruser.remote.ServiceMapClient; import org.springframework.beans.factory.annotation.Autowired; @@ -29,8 +30,9 @@ public class CarService { car.setTid(tid); //获得此车辆的轨迹id,trid - - + ResponseResult trackResult = serviceMapClient.addTrack(tid); + String trid = trackResult.getData().getTrid(); + car.setTid(trid); carMapper.insert(car); diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TrackController.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TrackController.java index e505293..099a1b1 100644 --- a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TrackController.java +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TrackController.java @@ -1,6 +1,7 @@ package com.taxi.servicemap.controller; import com.internal.dto.ResponseResult; +import com.internal.dto.TrackResponse; import com.taxi.servicemap.service.TrackService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -15,7 +16,7 @@ public class TrackController { private TrackService trackService; @PostMapping("/addTrack") - public ResponseResult addTrack(String tid){ + public ResponseResult addTrack(String tid){ return trackService.addTrack(tid); } } diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/remote/TrackClient.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/remote/TrackClient.java index 62e676c..d8e8ed0 100644 --- a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/remote/TrackClient.java +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/remote/TrackClient.java @@ -22,7 +22,7 @@ public class TrackClient { private RestTemplate restTemplate; - public ResponseResult addTrack(String tid){ + public ResponseResult addTrack(String tid){ //拼接请求的URL StringBuilder url = new StringBuilder(); url.append(AmapConfigConstant.TRACK_MAP_ADD_URL); diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/TrackService.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/TrackService.java index 33890ca..cee945d 100644 --- a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/TrackService.java +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/TrackService.java @@ -1,6 +1,7 @@ package com.taxi.servicemap.service; import com.internal.dto.ResponseResult; +import com.internal.dto.TrackResponse; import com.taxi.servicemap.remote.TrackClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,7 +11,7 @@ public class TrackService { @Autowired private TrackClient trackClient; - public ResponseResult addTrack(String tid){ + public ResponseResult addTrack(String tid){ return trackClient.addTrack(tid); } }