xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java
@@ -61,24 +61,29 @@ // 避让区域 ArrayList<String> pointStrParam = new ArrayList<>(); for (Document document : pointsInFence) { List<GeoPoint> points = document.getList("points", GeoPoint.class); // 一个区域的点位 ArrayList<String> pointStr = new ArrayList<>(); for (GeoPoint point : points) { pointStr.add( point.getLongitude()+","+point.getLatitude()); try { for (Document document : pointsInFence) { List<GeoPoint> points = document.getList("points", GeoPoint.class); // 一个区域的点位 ArrayList<String> pointStr = new ArrayList<>(); for (GeoPoint point : points) { pointStr.add( point.getLongitude()+","+point.getLatitude()); } if(!pointStr.isEmpty()){ pointStrParam.add(String.join(";", pointStr)); } } if(!pointStr.isEmpty()){ pointStrParam.add(String.join(";", pointStr)); RouteVo routeVo = gdMapGeocodingUtil.getDistanceAndTime(dto.getOrigin(), dto.getDestination(), String.join("|", pointStrParam), fenceId,dto.getRoutePlanRule()); if(routeVo==null){ return R.fail("没有找到路线"); } return R.ok(routeVo); }catch (Exception e){ e.printStackTrace(); } RouteVo routeVo = gdMapGeocodingUtil.getDistanceAndTime(dto.getOrigin(), dto.getDestination(), String.join("|", pointStrParam), fenceId,dto.getRoutePlanRule()); if(routeVo==null){ return R.fail("没有找到路线"); } return R.ok(routeVo); return R.fail("没有找到路线"); } xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
@@ -461,7 +461,7 @@ */ @ApiOperation(value = "订单查询实时轨迹路线") @PostMapping("/api/v1/order/queryOrderRoute") public R<RouteVo> queryOrderRoute(@RequestBody QueryOrderRouteDTO dto) { public R<RouteVo> queryOrderRoute(@Validated @RequestBody QueryOrderRouteDTO dto) { // 查询订单信息 XpOrder xpOrder = xpOrderService.getById(dto.getOrderId()); // 封装消息内容 xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/constant/I18nKeyConstant.java
@@ -28,4 +28,11 @@ // ========== 车辆开关车门 ========== String VEHICLE_NOT_P_GEAR = "vehicle.not.p.gear"; // ========== 车辆温度控制 ========== String VEHICLE_TEMPERATURE_UP = "vehicle.temperature.up"; String VEHICLE_TEMPERATURE_DOWN = "vehicle.temperature.down"; } xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java
@@ -185,6 +185,12 @@ if(Objects.isNull(xpVehicle)){ throw new ServiceException("未查询到有效车辆信息", I18nKeyConstant.VEHICLE_NOT_EXISTS); } if(dto.getTargetTemperature() > 28){ throw new ServiceException("温度最高28℃", I18nKeyConstant.VEHICLE_TEMPERATURE_UP); } if(dto.getTargetTemperature() < 22){ throw new ServiceException("温度最低22℃", I18nKeyConstant.VEHICLE_TEMPERATURE_DOWN); } // 设定温度 VehiclesCommandVo vehiclesCommandVo = new VehiclesCommandVo(); vehiclesCommandVo.setUid(xpOrder.getAppUserId()); xp-robotaxi-vehicle-convoy-boot/src/main/resources/i18n/messages_en_US.properties
@@ -13,4 +13,6 @@ vehicle.operation.info.incomplete=The following information is incomplete and cannot start operation: {0} vehicle.batch.operation.condition.not.met=The following vehicles do not meet operating conditions: {0} vehicle.time.expired=The following dates have expired, please enter valid dates: {0} vehicle.not.p.gear=The trunk cannot be opened when the vehicle is not in P gear vehicle.not.p.gear=The trunk cannot be opened when the vehicle is not in P gear vehicle.temperature.up=The highest temperature is 28°C vehicle.temperature.down=The lowest temperature is 22°C xp-robotaxi-vehicle-convoy-boot/src/main/resources/i18n/messages_zh_CN.properties
@@ -13,4 +13,6 @@ vehicle.operation.info.incomplete=以下信息未完善，无法开始运营：{0} vehicle.batch.operation.condition.not.met=以下车辆不满足运营条件：{0} vehicle.time.expired=以下时间已过期，请填写有效日期：{0} vehicle.not.p.gear=车辆非P档，无法开启后备箱 vehicle.not.p.gear=车辆非P档，无法开启后备箱 vehicle.temperature.up=温度最高28℃ vehicle.temperature.down=温度最低22℃
