xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/operation/CruisePointDto.java
New file @@ -0,0 +1,20 @@ package com.xiaopeng.api.dto.operation; import com.xiaopeng.api.model.order.XpCruiseOrder; import lombok.Data; @Data public class CruisePointDto { // 运车车辆id private Long vehicleId; // 当前点位id private Long pointId; // 1正方 2反方 private Integer orderReverse; // 订单数据 private XpCruiseOrder newXpCruiseOrder; } xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/operation/XpCruisePlanClientFallbackFactory.java
New file @@ -0,0 +1,45 @@ package com.xiaopeng.api.factory.operation; import com.xiaopeng.api.dto.map.XpPointExportExcelQuery; import com.xiaopeng.api.dto.operation.*; import com.xiaopeng.api.dto.order.HistoryEndPointsDto; import com.xiaopeng.api.dto.order.HistoryStartPointsDto; import com.xiaopeng.api.feignClient.operation.XpCruisePlanClient; import com.xiaopeng.api.feignClient.operation.XpPointClient; import com.xiaopeng.api.model.operation.XpElectronicFenceArea; import com.xiaopeng.api.model.operation.XpPoint; import com.xiaopeng.api.model.order.XpCruiseOrder; import com.xiaopeng.api.query.operation.PointListQuery; import com.xiaopeng.api.query.operation.PointPageListListQuery; import com.xiaopeng.api.vo.order.XpHistoryEndPointsVo; import com.xiaopeng.api.vo.order.XpHistoryStartPointsVo; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.web.page.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.Collections; import java.util.List; @Slf4j @Component public class XpCruisePlanClientFallbackFactory implements FallbackFactory<XpCruisePlanClient> { @Override public XpCruisePlanClient create(Throwable cause) { return new XpCruisePlanClient() { @Override public R<XpCruiseOrder> getCruisePoint(CruisePointDto dto) { log.error("XpCruisePlanClientFallbackFactory getCruisePoint error:{}", cause.getMessage()); return null; } @Override public R<XpCruiseOrder> getNewCruiseOrder(Long vehicleId) { log.error("XpCruisePlanClientFallbackFactory getNewCruiseOrder error:{}", cause.getMessage()); return null; } }; } } xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpCruisePlanClient.java
New file @@ -0,0 +1,47 @@ package com.xiaopeng.api.feignClient.operation; import com.xiaopeng.api.dto.map.XpPointExportExcelQuery; import com.xiaopeng.api.dto.operation.*; import com.xiaopeng.api.dto.order.HistoryEndPointsDto; import com.xiaopeng.api.dto.order.HistoryStartPointsDto; import com.xiaopeng.api.factory.operation.XpCruisePlanClientFallbackFactory; import com.xiaopeng.api.factory.operation.XpPointClientFallbackFactory; import com.xiaopeng.api.model.operation.XpCruisePlanPoint; import com.xiaopeng.api.model.operation.XpElectronicFenceArea; import com.xiaopeng.api.model.operation.XpPoint; import com.xiaopeng.api.model.order.XpCruiseOrder; import com.xiaopeng.api.query.operation.PointListQuery; import com.xiaopeng.api.query.operation.PointPageListListQuery; import com.xiaopeng.api.vo.order.XpHistoryEndPointsVo; import com.xiaopeng.api.vo.order.XpHistoryStartPointsVo; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.dto.ServiceNameConstantsEnum; import com.xiaopeng.common.core.web.page.PageInfo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @FeignClient(contextId = "XpCruisePlanClient", value = ServiceNameConstantsEnum.XP_OPERATION_SERVICE, fallbackFactory = XpCruisePlanClientFallbackFactory.class) public interface XpCruisePlanClient { /** * 获取车辆下个点位 * @return */ @PostMapping("/inner/cruise/getCruisePoint") R<XpCruiseOrder> getCruisePoint(@RequestBody CruisePointDto dto); /** * 组装巡游单子 * @return */ @PostMapping("/inner/cruise/getNewCruiseOrder") R<XpCruiseOrder> getNewCruiseOrder(@RequestParam Long vehicleId); } xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpCruisePlanPoint.java
@@ -38,7 +38,7 @@ private Long cruisePlanId; @ApiModelProperty(value = "点位ID") private Integer pointId; private Long pointId; @ApiModelProperty(value = "排序") private Integer sortOrder; xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpCruiseOrder.java
@@ -37,6 +37,10 @@ @ApiModelProperty(value = "车辆id") private Long vehicleId; @ApiModelProperty(value = "车队id") @TableField("fleet_id") private Long fleetId; @ApiModelProperty(value = "车辆vin") private String vehicleVin; @@ -76,7 +80,7 @@ @ApiModelProperty(value = "任务id") @TableField("mission_id") private String missionId; private Long missionId; @ApiModelProperty(value = "返程上次的订单id") @TableField("last_order_id") @@ -85,4 +89,8 @@ @ApiModelProperty(value = "订单号") @TableField("order_number") private String orderNumber; @ApiModelProperty(value = "方向 1正2反") @TableField("order_reverse") private Integer orderReverse; } xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/vehicleConvoy/XpVehicle.java
@@ -119,4 +119,9 @@ @TableField(exist = false) private String electronicName; @ApiModelProperty(value = "车队id") @TableField(exist = false) private Long fleetId; } xp-robotaxi-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -20,6 +20,7 @@ com.xiaopeng.api.factory.operation.XpCouponClientFallbackFactory com.xiaopeng.api.factory.operation.XpWhiteListClientFallbackFactory com.xiaopeng.api.factory.operation.XpElectronicFenceClientFallbackFactory com.xiaopeng.api.factory.operation.XpCruisePlanClientFallbackFactory com.xiaopeng.api.factory.operation.ReassignOrderClientFallbackFactory com.xiaopeng.api.factory.vehicleConvoy.UserVehicleClientFallbackFactory com.xiaopeng.api.factory.vehicleConvoy.XpFleetOperationsClientFallbackFactory xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.api.dto.map.OrderRouteAndFareDto; import com.xiaopeng.api.dto.operation.CruisePointDto; import com.xiaopeng.api.dto.operation.LonLatDto; import com.xiaopeng.api.dto.operation.ReassignOrderDTO; import com.xiaopeng.api.dto.order.PopOrderDto; @@ -12,6 +13,7 @@ import com.xiaopeng.api.dto.pushMessage.SendMessageDTO; import com.xiaopeng.api.feignClient.map.XpMapClient; import com.xiaopeng.api.feignClient.operation.ReassignOrderClient; import com.xiaopeng.api.feignClient.operation.XpCruisePlanClient; import com.xiaopeng.api.feignClient.order.XpCruiseOrderClient; import com.xiaopeng.api.feignClient.order.XpOrderClient; import com.xiaopeng.api.feignClient.pushMessage.XpPushMessageClient; @@ -107,6 +109,10 @@ private Snowflake snowflake; @Autowired private RedisService redisService; @Autowired private XpCruisePlanClient xpCruisePlanClient; /** @@ -845,9 +851,48 @@ long sequence1 = snowFlake.nextId(); xpuUtil.cloudCreateOrder(task, xpVehicle.getVehicleVin(),sequence1); }else if(xpCruiseOrder.getOrderType()==1){ // 正常巡游 找到下一个点位 若到达最后点位 则反向找点位 TODO v // 正常巡游 找到下一个点位 若到达最后点位 则反向找点位 // 起点 Double endLon = xpCruiseOrder.getEndLon(); Double endLat = xpCruiseOrder.getEndLat(); XpCruiseOrder newXpCruiseOrder = new XpCruiseOrder(); newXpCruiseOrder.setId("XU"+ IdUtil.fastUUID()); newXpCruiseOrder.setVehicleId(xpCruiseOrder.getVehicleId()); newXpCruiseOrder.setVehicleVin(xpCruiseOrder.getVehicleVin()); newXpCruiseOrder.setFleetId(xpCruiseOrder.getFleetId()); newXpCruiseOrder.setOrderType(1); newXpCruiseOrder.setStartLat(endLat); newXpCruiseOrder.setStartLon(endLon); newXpCruiseOrder.setStartPointId(xpCruiseOrder.getEndPointId()); newXpCruiseOrder.setStartPointName(xpCruiseOrder.getEndPointName()); newXpCruiseOrder.setStatus(1); newXpCruiseOrder.setLastOrderId(xpCruiseOrder.getId()); // 通过车找终点id CruisePointDto cruisePointDto = new CruisePointDto(); cruisePointDto.setNewXpCruiseOrder(newXpCruiseOrder); cruisePointDto.setVehicleId(xpCruiseOrder.getVehicleId()); cruisePointDto.setPointId(newXpCruiseOrder.getStartPointId()); cruisePointDto.setOrderReverse(xpCruiseOrder.getOrderReverse()); R<XpCruiseOrder> cruisePoint = xpCruisePlanClient.getCruisePoint(cruisePointDto); if(cruisePoint!=null){ xpCruiseOrderClient.addCruiseOrder(cruisePoint.getData()); // 下发任务 RTTask task = new RTTask(); task.setOrder_id(newXpCruiseOrder.getId()); task.setTask_id("MISSION_"+ IdUtil.fastUUID()); task.setTask_type(TaskType.CRUISE); task.setStatus(TaskStatus.PENDING); SnowFlake snowFlake = new SnowFlake(0, 0); snowFlake.withStartTimestamp(1420041600000L); long sequence1 = snowFlake.nextId(); xpuUtil.cloudCreateOrder(task, xpVehicle.getVehicleVin(),sequence1); } } } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java
@@ -4,6 +4,7 @@ import com.sun.xml.internal.bind.v2.TODO; import com.xiaopeng.api.dto.automaticPilot.PushOrderDto; import com.xiaopeng.api.feignClient.automaticPilot.OrderMissionClient; import com.xiaopeng.api.feignClient.operation.XpCruisePlanClient; import com.xiaopeng.api.feignClient.order.XpCruiseOrderClient; import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient; import com.xiaopeng.api.model.order.XpCruiseOrder; @@ -56,6 +57,8 @@ private MongoTemplate mongoTemplate; @Autowired private OrderMissionClient orderMissionClient; @Autowired private XpCruisePlanClient xpCruisePlanClient; /** * 车辆详情-车辆调度-发车 收车 @@ -76,7 +79,7 @@ // 发车 if(dto.getDepartureStatus()==1){ // 找车辆的任务 生成巡游单子 下发命令 TODO v xpCruisePlanClient.getNewCruiseOrder(xpVehicle.getId()); @@ -93,6 +96,8 @@ XpCruiseOrder xpCruiseOrder = new XpCruiseOrder(); xpCruiseOrder.setId("XU"+ IdUtil.fastUUID()); xpCruiseOrder.setVehicleId(xpVehicle.getId()); xpCruiseOrder.setFleetId(xpVehicle.getFleetId()); xpCruiseOrder.setOrderType(2); xpCruiseOrder.setStartLon(x); xpCruiseOrder.setStartLat(y); xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCruisePlanController.java
@@ -1,13 +1,23 @@ package com.xiaopeng.operation.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.xiaopeng.api.dto.operation.CruisePointDto; import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient; import com.xiaopeng.api.model.operation.XpCruisePlan; import com.xiaopeng.api.model.operation.XpCruisePlanPoint; import com.xiaopeng.api.model.operation.XpCruisePlanVehicle; import com.xiaopeng.api.model.operation.XpPoint; import com.xiaopeng.api.model.order.XpCruiseOrder; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.web.page.PageInfo; import com.xiaopeng.operation.dto.XpCruisePlanAddDTO; import com.xiaopeng.operation.dto.XpCruisePlanEditDTO; import com.xiaopeng.operation.query.CruisePlanQuery; import com.xiaopeng.operation.service.IXpCruisePlanPointService; import com.xiaopeng.operation.service.IXpCruisePlanService; import com.xiaopeng.operation.service.IXpCruisePlanVehicleService; import com.xiaopeng.operation.service.XpPointService; import com.xiaopeng.operation.vo.XpCruisePlanDetailVO; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -22,9 +32,12 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestParam; import io.swagger.annotations.ApiParam; import java.util.List; /** * <p> @@ -39,39 +52,117 @@ @RequiredArgsConstructor(onConstructor_ = @Lazy) public class XpCruisePlanController { private final IXpCruisePlanService xpCruisePlanService; private final IXpCruisePlanVehicleService xpCruisePlanVehicleService; private final IXpCruisePlanPointService xpCruisePlanPointService; private final XpPointService pointService; private final XpVehicleClient xpVehicleClient; @ApiOperation(value = "获取巡游计划分页列表", tags = {"管理后台-巡游计划"}) @PostMapping(value = {"/api/v1/xp-cruise-plan/pageList"}) public R<PageInfo<XpCruisePlan>> getPageList(@RequestBody CruisePlanQuery query){ public R<PageInfo<XpCruisePlan>> getPageList(@RequestBody CruisePlanQuery query) { return R.ok(xpCruisePlanService.getPageList(query)); } @ApiOperation(value = "新增巡游计划", tags = {"管理后台-巡游计划"}) @PostMapping(value = {"/api/v1/xp-cruise-plan/add"}) public R<?> add(@Valid @RequestBody XpCruisePlanAddDTO dto){ public R<?> add(@Valid @RequestBody XpCruisePlanAddDTO dto) { xpCruisePlanService.add(dto); return R.ok(); } @ApiOperation(value = "编辑巡游计划", tags = {"管理后台-巡游计划"}) @PostMapping(value = {"/api/v1/xp-cruise-plan/edit"}) public R<?> edit(@Valid @RequestBody XpCruisePlanEditDTO dto){ public R<?> edit(@Valid @RequestBody XpCruisePlanEditDTO dto) { xpCruisePlanService.edit(dto); return R.ok(); } @ApiOperation(value = "删除巡游计划", tags = {"管理后台-巡游计划"}) @DeleteMapping(value = {"/api/v1/xp-cruise-plan/deleteById/{id}"}) public R<?> deleteById(@ApiParam(name = "id", value = "巡游计划ID") @PathVariable Long id){ public R<?> deleteById(@ApiParam(name = "id", value = "巡游计划ID") @PathVariable Long id) { xpCruisePlanService.deleteById(id); return R.ok(); } @ApiOperation(value = "巡游计划详情", tags = {"管理后台-巡游计划"}) @GetMapping(value = {"/api/v1/xp-cruise-plan/detail"}) public R<XpCruisePlanDetailVO> detail(@ApiParam(name = "id", value = "巡游计划ID") @RequestParam Long id){ public R<XpCruisePlanDetailVO> detail(@ApiParam(name = "id", value = "巡游计划ID") @RequestParam Long id) { return R.ok(xpCruisePlanService.detail(id)); } /** * 获取车辆下个点位 * @return */ @PostMapping("/inner/cruise/getCruisePoint") public R<XpCruiseOrder> getCruisePoint(@RequestBody CruisePointDto dto) { // 先找计划 XpCruisePlanVehicle plan = xpCruisePlanVehicleService.getOne(new LambdaQueryWrapper<XpCruisePlanVehicle>().eq(XpCruisePlanVehicle::getVehicleId, dto.getVehicleId())); // 找对应的多个点位 List<XpCruisePlanPoint> planPointList = xpCruisePlanPointService.list(new LambdaQueryWrapper<XpCruisePlanPoint>().eq(XpCruisePlanPoint::getCruisePlanId, plan.getCruisePlanId()).orderByAsc(XpCruisePlanPoint::getSortOrder)); // 找到现在这个点位 // 根据dto的pointId 是第几个 int index = 0; for (int i = 0; i < planPointList.size(); i++) { if (planPointList.get(i).getPointId().equals(dto.getPointId())) { index = i; break; } } XpCruisePlanPoint xpCruisePlanPoint = null; // 判断是否是最后一个 是则往前一个 否找下一个 if (index == planPointList.size() - 1) { // 最后一个 找上一个 xpCruisePlanPoint = planPointList.get(index - 1); } else if (index == 0) { // 第一个 找下一个 xpCruisePlanPoint = planPointList.get(index + 1); } else { // 中间点位 if (dto.getOrderReverse() == 1) { // 正向 找下一个 xpCruisePlanPoint = planPointList.get(index + 1); } else { // 反向找上一个 xpCruisePlanPoint = planPointList.get(index - 1); } } Long pointId = xpCruisePlanPoint.getPointId(); XpPoint point = pointService.getById(pointId); XpCruiseOrder newXpCruiseOrder = dto.getNewXpCruiseOrder(); newXpCruiseOrder.setEndPointId(pointId); newXpCruiseOrder.setEndPointName(point.getPointName()); newXpCruiseOrder.setEndLon(point.getPointLon()); newXpCruiseOrder.setEndLat(point.getPointLat()); newXpCruiseOrder.setMissionId(xpCruisePlanPoint.getCruisePlanId()); return R.ok(newXpCruiseOrder); } @PostMapping("/inner/cruise/getNewCruiseOrder") public R<XpCruiseOrder> getNewCruiseOrder(@RequestParam Long vehicleId) { // 获取车辆的车队id // 先找计划 XpCruisePlanVehicle plan = xpCruisePlanVehicleService.getOne(new LambdaQueryWrapper<XpCruisePlanVehicle>().eq(XpCruisePlanVehicle::getVehicleId, vehicleId)); // 找对应的多个点位 List<XpCruisePlanPoint> planPointList = xpCruisePlanPointService.list(new LambdaQueryWrapper<XpCruisePlanPoint>().eq(XpCruisePlanPoint::getCruisePlanId, plan.getCruisePlanId()).orderByAsc(XpCruisePlanPoint::getSortOrder)); XpCruisePlanPoint xpCruisePlanPoint = planPointList.get(0); Long pointId = xpCruisePlanPoint.getPointId(); XpPoint point = pointService.getById(pointId); XpCruiseOrder newXpCruiseOrder = new XpCruiseOrder(); newXpCruiseOrder.setStartLon(point.getPointLon()); newXpCruiseOrder.setStartLat(point.getPointLat()); newXpCruiseOrder.setStartPointId(pointId); newXpCruiseOrder.setStartPointName(point.getPointName()); newXpCruiseOrder.setMissionId(xpCruisePlanPoint.getCruisePlanId()); return null; } }
@@ -35,7 +35,7 @@ @Accessors(chain = true) public static class CruisePlanPointDTO{ @ApiModelProperty(value = "点位ID") private Integer pointId; private Long pointId; @ApiModelProperty(value = "排序") private Integer sortOrder; xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpCruisePlanServiceImpl.java
@@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetClient; import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetVehicleClient; import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient; @@ -22,7 +23,6 @@ import com.xiaopeng.operation.query.CruisePlanQuery; import com.xiaopeng.operation.service.IXpCruisePlanPointService; import com.xiaopeng.operation.service.IXpCruisePlanService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xiaopeng.operation.service.IXpCruisePlanVehicleService; import com.xiaopeng.operation.service.IXpPointService; import com.xiaopeng.operation.vo.XpCruisePlanDetailVO; @@ -173,7 +173,6 @@ List<Long> pointIds = planPoints.stream() .map(XpCruisePlanPoint::getPointId) .filter(Objects::nonNull) .map(Integer::longValue) .collect(Collectors.toList()); Map<Long, XpPoint> pointMap = CollUtil.isNotEmpty(pointIds) ? xpPointService.listByIds(pointIds).stream() @@ -285,7 +284,7 @@ if (CollUtil.isEmpty(pointList)) { throw new ServiceException("关联点位列表不能为空", I18nKeyConstant.CRUISE_PLAN_POINT_EMPTY); } Set<Integer> pointIdSet = new HashSet<>(); Set<Long> pointIdSet = new HashSet<>(); for (XpCruisePlanAddDTO.CruisePlanPointDTO pointDTO : pointList) { if (pointDTO.getPointId() == null || pointDTO.getSortOrder() == null || pointDTO.getStopFlag() == null) { throw new ServiceException("点位参数不完整", I18nKeyConstant.CRUISE_PLAN_POINT_INCOMPLETE); xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/vo/XpCruisePlanPointVO.java
@@ -17,7 +17,7 @@ public class XpCruisePlanPointVO { @ApiModelProperty(value = "点位ID") private Integer pointId; private Long pointId; @ApiModelProperty(value = "点位名称") private String pointName; xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -1216,8 +1216,10 @@ // 结束后的车辆操作 if(vehicle!=null){ // 生成新的巡游单子 回到最新巡游的初始起点位置 XpCruiseOrder xpCruiseOrders = xpCruiseOrderMapper.selectOne(new LambdaQueryWrapper<XpCruiseOrder>().eq(XpCruiseOrder::getVehicleId, vehicle.getId()).eq(XpCruiseOrder::getStatus, 2).orderByDesc(BaseModel::getCreateTime).last("limit 1")); XpCruiseOrder xpCruiseOrder = new XpCruiseOrder(); XpCruiseOrder xpCruiseOrders = xpCruiseOrderMapper.selectOne(new LambdaQueryWrapper<XpCruiseOrder>().eq(XpCruiseOrder::getVehicleId, vehicle.getId()).eq(XpCruiseOrder::getStatus, 2).orderByDesc(BaseModel::getCreateTime).last("limit 1")); XpCruiseOrder xpCruiseOrder = new XpCruiseOrder(); xpCruiseOrder.setVehicleId(vehicle.getId()); xpCruiseOrder.setFleetId(vehicle.getFleetId()); xpCruiseOrder.setVehicleVin(vehicle.getVehicleVin()); xpCruiseOrder.setOrderType(2); // 返程起点是当前正常订单的终点 @@ -1682,6 +1684,7 @@ if (byVehicleVin.getCode() == 200) { vehicle = byVehicleVin.getData(); order.setVehicleId(vehicle.getId()); order.setFleetId(vehicle.getFleetId()); addTaxiPassengerVo.setVin(vehicle.getVehicleVin()); } order.setStatus(2); xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
@@ -19,6 +19,7 @@ import com.xiaopeng.api.feignClient.order.XpOrderClient; import com.xiaopeng.api.model.maintenance.XpTask; import com.xiaopeng.api.model.maintenance.XpTaskRule; 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.vehicleConvoy.VehiclesCommandCallbackVo; @@ -32,6 +33,7 @@ import com.xiaopeng.vehicleConvoy.model.importExcel.XpVehicleImportExcel; import com.xiaopeng.vehicleConvoy.model.query.*; import com.xiaopeng.vehicleConvoy.model.vo.XpVehicleVO; import com.xiaopeng.vehicleConvoy.service.IXpFleetVehicleService; import com.xiaopeng.vehicleConvoy.service.IXpVehicleAnnualRecordService; import com.xiaopeng.vehicleConvoy.service.IXpVehicleService; import io.swagger.annotations.*; @@ -73,7 +75,7 @@ public class XpVehicleController { private final IXpVehicleService xpVehicleService; private final XpOrderClient xpOrderClient; private final IXpFleetVehicleService vehicleService; private final IXpVehicleAnnualRecordService xpVehicleAnnualRecordService; private final XpVehiclePreparationClient xpVehiclePreparationClient; private final XpChargingRecordClient xpChargingRecordClient; @@ -111,7 +113,11 @@ */ @GetMapping("/inner/vehicle/queryById") public R<XpVehicle> queryById(@RequestParam Long id) { return R.ok(xpVehicleService.getById(id)); XpVehicle xpVehicle = xpVehicleService.getById(id); // 获取车队 XpFleetVehicle xpFleetVehicle = vehicleService.getOne(new LambdaQueryWrapper<XpFleetVehicle>().eq(XpFleetVehicle::getVehicleId, xpVehicle.getId())); xpVehicle.setFleetId(xpFleetVehicle.getFleetId()); return R.ok(xpVehicle); } /** * 修改车辆信息（内部接口） @@ -424,6 +430,10 @@ @GetMapping("/inner/vehicle/findByVehicleVin") public R<XpVehicle> findByVehicleVin(@RequestParam("vehicleVin") String vehicleVin){ XpVehicle xpVehicle = xpVehicleService.getOne(new LambdaQueryWrapper<XpVehicle>().eq(XpVehicle::getVehicleVin, vehicleVin)); // 获取车队 XpFleetVehicle xpFleetVehicle = vehicleService.getOne(new LambdaQueryWrapper<XpFleetVehicle>().eq(XpFleetVehicle::getVehicleId, xpVehicle.getId())); xpVehicle.setFleetId(xpFleetVehicle.getFleetId()); return R.ok(xpVehicle); }
