xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpQualificationAuditServiceImpl.java
@@ -74,9 +74,8 @@ // 角色名称匹配 for (XpQualificationAuditVO xpQualificationAuditVO : list) { map.get(xpQualificationAuditVO.getOperationsUserId()).forEach(sysRole -> { xpQualificationAuditVO.getRoleNames().add(sysRole.getRoleName()); }); List<SysRole> roleList = map.get(xpQualificationAuditVO.getOperationsUserId()); xpQualificationAuditVO.setRoleNames(roleList.stream().map(SysRole::getRoleName).collect(Collectors.toList())); } } } xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/controller/XpPricingController.java
@@ -90,9 +90,9 @@ @XpClientCheck(checkToken = false, checkOtpToken = true) public R<SaveOrderVo> saveOrder(@RequestBody @Validated XpOrderDto dto, HttpServletRequest request) { String uid = request.getHeader("XP-Uid"); Long l = xpPricingService.saveOrder(dto, uid); String orderId = xpPricingService.saveOrder(dto, uid); SaveOrderVo saveOrderVo = new SaveOrderVo(); saveOrderVo.setOrderId(l); saveOrderVo.setOrderId(orderId); return R.ok(saveOrderVo); }
@@ -43,7 +43,7 @@ * @param uid * @return */ Long saveOrder(XpOrderDto dto, String uid); String saveOrder(XpOrderDto dto, String uid); void testOrder(Long orderId, Integer status);
@@ -415,7 +415,7 @@ @Override public Long saveOrder(XpOrderDto dto, String uid) { public String saveOrder(XpOrderDto dto, String uid) { // 是否在运营区域时间内 @@ -561,7 +561,7 @@ if (isSilent) { // todo 用于测试流程，正式联调需要删除此代码 // testOrder(orderId); return orderId; return orderId.toString(); } // 最大距离 @@ -601,7 +601,7 @@ xpGeoQueryEntity.setTimestamp(System.currentTimeMillis()); geoQueryEntityService.save(xpGeoQueryEntity); return orderId; return orderId.toString(); } } @@ -620,7 +620,7 @@ xpGeoQueryEntity.setStatus(0); geoQueryEntityService.save(xpGeoQueryEntity); return orderId; return orderId.toString(); // // XpElectronicFenceArea xpElectronicFenceArea = xpElectronicFenceAreaMapper.selectById(dto.getXpElectronicFenceAreaId()); xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/vo/SaveOrderVo.java
@@ -8,5 +8,5 @@ @ApiModel(value = "保存订单返回") public class SaveOrderVo { @ApiModelProperty(value = "订单id 0静默不推单") private Long orderId; private String orderId; } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
@@ -30,10 +30,12 @@ import com.xiaopeng.operation.vo.NearestVo; import com.xiaopeng.operation.vo.OrderDistanceVo; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.time.LocalTime; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; @@ -159,6 +161,14 @@ @Override public List<XpPoint> listAll(PointListQuery query) { if(StringUtils.hasLength(query.getOperationStatus())){ String[] split = query.getOperationStatus().split(","); List<Integer> statusIds = new ArrayList<>(); for (String s : split) { statusIds.add(Integer.valueOf(s)); } query.setOperationStatusIds(statusIds); } List<XpPoint> list = this.baseMapper.listAll(query); return list; } xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -1033,6 +1033,7 @@ throw new ServiceException("订单不存在",I18nKeyConstant.ORDER_NOT_EXISTS); } order.setStatus(0); order.setAppUserId(null); baseMapper.updateById(order); XpOrderCancel xpOrderCancel = new XpOrderCancel(); xpOrderCancel.setOrderId(Long.valueOf(orderId)); @@ -2009,7 +2010,7 @@ // 存mongo数据 xpPricingClient.updateXpGeoQueryEntity(split[0]); order.setAppUserId(null); this.updateById(order); // 修改车辆信息 vehicle.setState(1); @@ -2017,6 +2018,8 @@ //绑定用户和车辆关系 addTaxiPassengerVo.setUid(order.getAppUserId().toString()); this.updateById(order); addTaxiPassengerVo.setOrderNo(order.getOrderNumber()); // TODO appid addTaxiPassengerVo.setAppId(""); xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java
@@ -15,6 +15,7 @@ import com.xiaopeng.api.model.order.XpOrder; 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.operation.ElectronicFenceDetailVo; import com.xiaopeng.api.vo.vehicleConvoy.VehiclesCommandEnum; import com.xiaopeng.api.vo.vehicleConvoy.VehiclesCommandParamVo; @@ -37,7 +38,10 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.geo.GeoJsonPoint; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -75,6 +79,8 @@ private XpuVinClient xpuVinClient; @Autowired private RedisService redisService; @Autowired private MongoTemplate mongoTemplate; @Override public List<XpVehicle> listByIds(List<Long> ids) { @@ -149,6 +155,15 @@ xpVehicleVO.setLongitude(geoJsonPoint.getX()); xpVehicleVO.setLatitude(geoJsonPoint.getY()); } // 查询车辆的续航里程 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); } } pageInfo.setRecords(list);
