java/Robotaxi.git

			@@ -112,17 +112,6 @@
			XpCruiseOrder returnCruisePoint = xpCruisePlanClient.findReturnCruisePoint(xpCruiseOrder).getData();
			if(returnCruisePoint!=null){
			xpCruiseOrderClient.addCruiseOrder(returnCruisePoint);
			// 下发命令
			PushOrderDto pushOrderDto = new PushOrderDto();
			pushOrderDto.setVin(returnCruisePoint.getVehicleVin());
			pushOrderDto.setOrderId("XU" + returnCruisePoint.getId());
			pushOrderDto.setStartLatitude(returnCruisePoint.getStartLat());
			pushOrderDto.setStartLongitude(returnCruisePoint.getStartLon());
			pushOrderDto.setEndLatitude(returnCruisePoint.getEndLat());
			pushOrderDto.setEndLongitude(returnCruisePoint.getEndLon());
			pushOrderDto.setOrderType(OrderType.CRUISE_ORDER);
			pushOrderDto.setStage(2);
			orderMissionClient.pushOrder(pushOrderDto);
			}

			}

			@@ -224,17 +224,6 @@
			R<XpCruiseOrder> returnCruisePoint = xpCruisePlanClient.findReturnCruisePoint(xpCruiseOrder);
			if (returnCruisePoint.getData() != null) {
			xpCruiseOrderClient.addCruiseOrder(returnCruisePoint.getData());
			// 下发命令
			PushOrderDto pushOrderDto = new PushOrderDto();
			pushOrderDto.setVin(returnCruisePoint.getData().getVehicleVin());
			pushOrderDto.setOrderId("XU" + returnCruisePoint.getData().getId());
			pushOrderDto.setStartLatitude(returnCruisePoint.getData().getStartLat());
			pushOrderDto.setStartLongitude(returnCruisePoint.getData().getStartLon());
			pushOrderDto.setEndLatitude(returnCruisePoint.getData().getEndLat());
			pushOrderDto.setEndLongitude(returnCruisePoint.getData().getEndLon());
			pushOrderDto.setOrderType(OrderType.CRUISE_ORDER);
			pushOrderDto.setStage(2);
			orderMissionClient.pushOrder(pushOrderDto);
			}
			log.info("向车辆[{}]发送收车指令", xpVehicle.getPlateNumber());
			}

			@@ -2386,7 +2386,7 @@
			order.setFleetId(vehicle.getFleetId());
			addTaxiPassengerVo.setVin(vehicle.getVehicleVin());
			}
			order.setStatus(3);
			order.setStatus(2);

			// Redis弹出这个队列元素
			// value 订单Id_经纬度_状态_用户id_订单编号_距离_时间

	xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/schedule/VehicleCollectionScheduleTask.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史