xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/map/XpMapClient.java
@@ -21,7 +21,7 @@ * @param dto * @return */ @PostMapping("/base/v1/mini-program/map/getDistanceAndDuration") @PostMapping("/base/v1/map/getDistanceAndDuration") R<RouteVo> getDistanceAndDuration(@RequestBody RouteAndFareDto dto); /** @@ -29,7 +29,7 @@ * @param dto * @return */ @PostMapping("/base/v1/mini-program/map/getOrderDistanceAndDuration") @PostMapping("/base/v1/map/getOrderDistanceAndDuration") R<RouteVo> getOrderDistanceAndDuration(@RequestBody OrderRouteAndFareDto dto); @@ -38,7 +38,7 @@ * @param routedID * @return */ @PostMapping("/base/v1/mini-program/map/queryRouted") @PostMapping("/base/v1/map/queryRouted") R<String> queryRouted(@RequestParam("routedID") String routedID); @@ -49,7 +49,7 @@ * @param dto * @return */ @PostMapping("/base/v1/mini-program/fence/diagnosisArea") @PostMapping("/base/v1/fence/diagnosisArea") R<Boolean> diagnosisArea(@RequestBody RouteAndFareDto dto);
@@ -6,6 +6,7 @@ import com.xiaopeng.common.core.dto.ServiceNameConstantsEnum; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -13,7 +14,9 @@ @FeignClient(contextId = "XpOpenCityClient", value = ServiceNameConstantsEnum.XP_OPERATION_SERVICE, fallbackFactory = XpOpenCityClientFallbackFactory.class) public interface XpOpenCityClient { @GetMapping("/base/v1/mini-program/api/v1/openCity/nameList") @GetMapping("/base/v1/openCity/nameList") R<List<String>> pageList(@RequestParam String cityIds); @@ -24,6 +27,7 @@ * @param districtCode * @return */ @PostMapping("/inner/v1/openCity/getXpOpenCity") R<XpOpenCity> getXpOpenCity(@RequestParam("provinceCode") String provinceCode, @RequestParam("cityCode") String cityCode, @RequestParam("districtCode") String districtCode); xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpPointClient.java
@@ -31,10 +31,10 @@ public interface XpPointClient { @PostMapping("/base/v1/mini-program/xp-point/getHistoryStartPoints") @PostMapping("/base/v1/xp-point/getHistoryStartPoints") R<List<XpHistoryStartPointsVo>> getHistoryStartPoints(@RequestBody HistoryStartPointsDto historyStartPointsDto); @PostMapping("/base/v1/mini-program/xp-point/getHistoryEndPoints") @PostMapping("/base/v1/xp-point/getHistoryEndPoints") R<List<XpHistoryEndPointsVo>> getHistoryEndPoints(@RequestBody HistoryEndPointsDto historyEndPointsDto); @@ -90,7 +90,7 @@ R<List<XpPoint>> pointMap(@RequestBody PointMapQuery query); @PostMapping("/base/v1/mini-program/inner/point/getPointsInfo") @PostMapping("/inner/v1/point/getPointsInfo") R<List<XpPoint>> getPointsInfo(@RequestBody Set<Long> points); /** @@ -99,6 +99,6 @@ * @param pointId * @return */ @GetMapping("/base/v1/mini-program/inner/point/nowInTimePoint") @GetMapping("/inner/v1/point/nowInTimePoint") R<Boolean> nowInTimePoint(@RequestParam Long pointId); } xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpPricingClient.java
@@ -17,11 +17,11 @@ /** * 获取等待时间 */ @PostMapping("/base/v1/mini-program/pricing/getWaitTime") @PostMapping("/inner/v1/pricing/getWaitTime") R<Integer> getWaitTime(@RequestBody LonLatDto dto); // 根据开通城市 获取定价 @GetMapping("/base/v1/mini-program/getPricingByCid") @GetMapping("/inner/v1/getPricingByCid") R<XpPricing> getPricingByCid(@RequestParam Long cityId); /** xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpSystemSettingClient.java
@@ -14,20 +14,20 @@ public interface XpSystemSettingClient { @GetMapping("/base/v1/mini-program/support/getOrderDistance") @GetMapping("/base/v1/support/getOrderDistance") R getOrderDistance(); /** * 获取自动结束行程时间 * @return */ @GetMapping("/api/v1/mini-program/support/getOrderFinishTime") @GetMapping("/api/v1/support/getOrderFinishTime") R<Integer> getOrderFinishTime(); /** * 获取反馈类型 * @return */ @GetMapping("/base/v1/mini-program/getFeedbackTypeById/{id}") @GetMapping("/base/v1/getFeedbackTypeById/{id}") R<XpFeedbackType> getFeedbackTypeById(@PathVariable("id")Long id); } xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/controller/XpPricingController.java
@@ -86,6 +86,12 @@ } @PostMapping("/inner/v1/pricing/getWaitTime") public R<Integer> getWaitTime1(@RequestBody LonLatDto dto) { return R.ok(xpPricingService.getWaitTime(dto.getLongitude(), dto.getLatitude())); } /** * 播单 @@ -134,11 +140,6 @@ @GetMapping("/base/v1/mini-program/order/testOrder") public R testOrder(Long orderId, Integer status){ xpPricingService.testOrder(orderId, status); return R.ok(); } } xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceController.java
@@ -74,7 +74,7 @@ * @param dto * @return */ @PostMapping("/base/v1/mini-program/fence/diagnosisArea") @PostMapping("/base/v1/fence/diagnosisArea") public R<Boolean> diagnosisArea(@RequestBody RouteAndFareDto dto){ return R.ok(xpElectronicFenceAreaService.diagnosisArea(dto)); } xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java
@@ -33,7 +33,7 @@ @Slf4j @RestController @RequestMapping("/base/v1/mini-program") @RequestMapping("") @Api(tags = "地图调用服务") public class XpMapController { @@ -53,7 +53,7 @@ } @PostMapping("/map/getDistanceAndDuration") @PostMapping("/base/v1/map/getDistanceAndDuration") public R<RouteVo> getDistanceAndDuration(@RequestBody RouteAndFareDto dto){ // 获取电子围栏的禁行区域点位 GeoPoint startPoint = new GeoPoint(dto.getOrigin().getLongitude(),dto.getOrigin().getLatitude()); @@ -111,7 +111,7 @@ * @param dto * @return */ @PostMapping("/map/getOrderDistanceAndDuration") @PostMapping("/base/v1/map/getOrderDistanceAndDuration") public R<RouteVo> getOrderDistanceAndDuration(@Validated @RequestBody OrderRouteAndFareDto dto){ // 获取电子围栏的禁行区域点位 GeoPoint startPoint = new GeoPoint(dto.getOrigin().getLongitude(),dto.getOrigin().getLatitude()); @@ -156,7 +156,7 @@ * @param routedID * @return */ @PostMapping("/map/queryRouted") @PostMapping("/base/v1/map/queryRouted") public R<String> getOrderDistanceAndDuration(@RequestParam("routedID") String routedID){ return R.ok(gdMapGeocodingUtil.routed(routedID)); } @@ -166,7 +166,7 @@ * 根据ip获取点位 */ @ApiOperation(value = "根据ip获取点位", tags = {"小程序-站点导航"}) @GetMapping("/point/getPointByIp") @GetMapping("/base/v1/mini-program/point/getPointByIp") public R<PointByIpVo> getPointByIp(HttpServletRequest request) throws IOException { String ip = request.getRemoteAddr(); PointByIpVo pointByIpVo = AmapWalkingRouteUtil.ipLocation(ip); xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpFeedbackTypeController.java
@@ -42,7 +42,7 @@ * * @return */ @GetMapping("/base/v1/mini-program/getFeedbackTypeById/{id}") @GetMapping("/base/v1/getFeedbackTypeById/{id}") public R<XpFeedbackType> getFeedbackTypeById(@PathVariable("id") Long id) { return R.ok(xpFeedbackTypeService.getById(id)); } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpOpenCityController.java
@@ -23,7 +23,7 @@ @Slf4j @RestController @RequestMapping("/base/v1/mini-program") @RequestMapping("") @Api(tags = "开通城市模块") public class XpOpenCityController extends BaseController { @@ -40,7 +40,7 @@ * @return */ @ApiOperation(value = "获取开通城市列表",tags = {"小程序-开通城市列表"},response = XpOpenCityVo.class) @GetMapping("/cities/list") @GetMapping("/base/v1/mini-program/cities/list") public R<XpOpenCityVo> citiesList() { return R.ok(xpOpenCityService.citiesList()); } @@ -60,7 +60,7 @@ /** * 获取开通城市名称列表 */ @GetMapping("/api/v1/openCity/nameList") @GetMapping("/base/v1/openCity/nameList") public R<List<String>> getOpenCityNameList(String openCityIds) { List<XpOpenCity> list = xpOpenCityService.listByIds(Arrays.asList(openCityIds.split(","))); ArrayList<String> nameLists = new ArrayList<>(list.size()); @@ -147,6 +147,7 @@ public R<XpOpenCity> getXpOpenCity(@RequestParam("provinceCode") String provinceCode, @RequestParam("cityCode") String cityCode, @RequestParam("districtCode") String districtCode){ XpOpenCity xpOpenCity = xpOpenCityService.getXpOpenCity(provinceCode, cityCode, districtCode); return R.ok(xpOpenCity); } } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointController.java
@@ -26,7 +26,7 @@ @Slf4j @RestController @RequestMapping("/base/v1/mini-program") @RequestMapping("") @Api(tags = "点位模块") public class XpPointController extends BaseController { @@ -41,7 +41,7 @@ * 获取附近上车站点 */ @ApiOperation(value = "获取附近上车站点",tags = {"小程序-附近上车站点"},response = XpPoint.class) @PostMapping("/pickup/nearest") @PostMapping("/base/v1/mini-program/pickup/nearest") public R<NearestVo> nearest(@RequestBody @Valid NearestDto dto) { return R.ok(xpPointService.nearest(dto)); } @@ -52,7 +52,7 @@ * @param historyStartPointsDto * @return */ @PostMapping("/xp-point/getHistoryStartPoints") @PostMapping("/base/v1/xp-point/getHistoryStartPoints") public R<List<XpHistoryStartPointsVo>> getHistoryStartPoints(@RequestBody HistoryStartPointsDto historyStartPointsDto){ List<XpHistoryStartPointsVo> xpPoints = xpPointService.getHistoryStartPoints(historyStartPointsDto); return R.ok(xpPoints); @@ -63,7 +63,7 @@ * @param historyEndPointsDto * @return */ @PostMapping("/xp-point/getHistoryEndPoints") @PostMapping("/base/v1/xp-point/getHistoryEndPoints") public R<List<XpHistoryEndPointsVo>> getHistoryEndPoints(@RequestBody HistoryEndPointsDto historyEndPointsDto){ List<XpHistoryEndPointsVo> xpPoints = xpPointService.getHistoryEndPoints(historyEndPointsDto); return R.ok(xpPoints); @@ -74,14 +74,14 @@ * 根据名称获取点位列表 */ @ApiOperation(value = "根据名称poi获取点位列表",tags = {"小程序-根据名称获取点位列表"},response = XpPoint.class) @PostMapping("/xp-point/queryPointByName") @PostMapping("/base/v1/mini-program/xp-point/queryPointByName") public R<XpPointsSearchVo> listAll(@RequestBody @Valid PointByNameQuery query) { XpPointsSearchVo vo = xpPointService.queryPointByName(query); return R.ok(vo); } @PostMapping("/inner/point/getPointsInfo") @PostMapping("/inner/v1/point/getPointsInfo") public R<List<XpPoint>> getPointsInfo(@RequestBody Set<Long> points){ List<XpPoint> xpPoints = xpPointService.listByIds(points); return R.ok(xpPoints); @@ -91,7 +91,7 @@ * 获取下单最大距离 最小距离 */ @ApiOperation(value = "获取可下单最大距离 最小距离",tags = {"小程序-获取可下单最大距离 最小距离"},response = XpPoint.class) @GetMapping("/xp-point/getOrderDistance") @GetMapping("/base/v1/mini-program/xp-point/getOrderDistance") public R<OrderDistanceVo> getOrderDistance() { OrderDistanceVo vo = xpPointService.getOrderDistance(); return R.ok(vo); @@ -103,7 +103,7 @@ * @param pointId * @return */ @GetMapping("/inner/point/nowInTimePoint") @GetMapping("/inner/v1/point/nowInTimePoint") public R<Boolean> nowInTimePoint(@RequestParam Long pointId){ return R.ok(xpPointService.nowInTimePoint(pointId)); } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPricingController.java
@@ -75,7 +75,7 @@ return R.ok(pricing); } // 根据开通城市 获取定价 @GetMapping("/base/v1/mini-program/getPricingByCid") @GetMapping("/inner/v1/getPricingByCid") public R<XpPricing> getPricingByCid(@RequestParam Long cityId) { XpPricing pricing = xpPricingService.lambdaQuery().eq(XpPricing::getCityId, cityId).last("limit 1").one(); return R.ok(pricing); xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java
@@ -54,12 +54,27 @@ return R.ok(xpSystemSettingService.getOrderDistance()); } @GetMapping("/base/v1/support/getOrderDistance") @ApiOperation(value = "获取下单距离",tags = {"小程序首页-服务调用获取下单距离"},response = Integer.class) public R getOrderDistance1() { return R.ok(xpSystemSettingService.getOrderDistance()); } @ApiOperation(value = "获取自动结束行程时间",tags = {"小程序-业务流程"},response = Integer.class) @GetMapping("/api/v1/mini-program/support/getOrderFinishTime") public R<Integer> getOrderFinishTime() { return R.ok(xpSystemSettingService.getOrderFinishTime()); } @GetMapping("/api/v1/support/getOrderFinishTime") public R<Integer> getOrderFinishTime1() { return R.ok(xpSystemSettingService.getOrderFinishTime()); } @GetMapping("/base/v1/support/phone") @ApiOperation(value = "获取客服电话", tags = {"运维APP-个人中心"}, response = String.class) public R<CustomerServicePhoneVo> getCustomerPhone() {
