xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/vehicleConvoy/XpVehicle.java
@@ -115,7 +115,7 @@ private Integer currentElectricity; @ApiModelProperty(value = "续航公里") private Double mileageRange; private Float mileageRange; @ApiModelProperty(value = "车辆接单状态 1接单中 0空闲") private Integer state; xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/vehicleConvoy/XpVehicleAnnualRecord.java
@@ -64,4 +64,5 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime qualificationExpireTime; } xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
@@ -252,9 +252,8 @@ dto.setRouteType(1); dto.setLongitude(longitude); dto.setLatitude(latitude); //TODO 这两个字段现在拿不到 // dto.setDuration(rtTripInfo.getRemaining_time()); // dto.setDistance(rtTripInfo.getRemaining_distance().intValue()); dto.setDuration(10); dto.setDistance(2); xpPushMessageClient.pushOrderRoute(dto); } @@ -368,12 +367,11 @@ if (null != orderId) { PushOrderRouteDTO dto = new PushOrderRouteDTO(); dto.setOrderId(orderId); dto.setRouteType(1); dto.setRouteType(2); dto.setLongitude(longitude); dto.setLatitude(latitude); //TODO 这两个字段现在拿不到 // dto.setDuration(rtTripInfo.getRemaining_time()); // dto.setDistance(rtTripInfo.getRemaining_distance().intValue()); dto.setDuration(20); dto.setDistance(10); xpPushMessageClient.pushOrderRoute(dto); }
@@ -941,6 +941,11 @@ if (order.getStatus() > 5 || order.getStatus() < 1) { throw new ServiceException("订单状态错误",I18nKeyConstant.ORDER_STATUS_ERROR); } if(order.getStatus()==1){ order.setStatus(0); baseMapper.updateById(order); return; } order.setStatus(0); // 组装调用车机参数 xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
@@ -22,6 +22,7 @@ import com.xiaopeng.api.model.vehicleConvoy.XpFleetVehicle; import com.xiaopeng.api.model.vehicleConvoy.XpVehicle; import com.xiaopeng.api.model.vehicleConvoy.XpVehicleAnnualRecord; import com.xiaopeng.api.vo.automaticPilot.VehiclePosition; import com.xiaopeng.api.vo.vehicleConvoy.VehiclesCommandCallbackVo; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.exception.ServiceException; @@ -43,10 +44,14 @@ import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -81,6 +86,7 @@ private final XpChargingRecordClient xpChargingRecordClient; private final XpTaskClient xpTaskClient; private final XpTaskRuleClient xpTaskRuleClient; private final MongoTemplate mongoTemplate; /** * 根据ID列表批量查询车辆信息（内部接口） * @@ -213,7 +219,6 @@ /** * 导出在库车辆列表 * * @param query 查询参数 */ @ApiOperation(value = "下载导入模板", tags = {"管理后台-车辆管理-在库车辆管理"}) @PostMapping("/api/v1/vehicle/importTemplate") @@ -582,6 +587,15 @@ } } } // 查询车辆的续航里程 VehiclePosition vehiclePosition = mongoTemplate.findOne(new Query(Criteria.where("vin").is(xpVehicleVO.getVehicleVin())), VehiclePosition.class); if(Objects.nonNull(vehiclePosition)){ xpVehicleVO.setMileageRange(vehiclePosition.getMileageRange()); xpVehicleVO.setCurrentElectricity(vehiclePosition.getCurrentElectricity()); }else { xpVehicleVO.setMileageRange(0F); xpVehicleVO.setCurrentElectricity(0); } return R.ok(xpVehicleVO); }
