xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/VehiclePosition.java
@@ -67,4 +67,8 @@ * 总里程 */ private Float totalOdometer; /** * 添加时间 */ private Long addTime; } xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
@@ -358,6 +358,7 @@ vehiclePosition.setMileageRange(dynamicStatus.getDstBatDisp()); vehiclePosition.setOrderId(orderId); vehiclePosition.setTotalOdometer(dynamicStatus.getTotalOdometer()); vehiclePosition.setAddTime(System.currentTimeMillis()); mongoTemplate.save(vehiclePosition); }else{ vehiclePosition.setOrderId(orderId); @@ -370,7 +371,8 @@ .set("mileageRange", dynamicStatus.getDstBatDisp()) .set("hasOrder", hasOrder) .set("orderId", orderId) .set("totalOdometer", dynamicStatus.getTotalOdometer()); .set("totalOdometer", dynamicStatus.getTotalOdometer() .set("addTime", System.currentTimeMillis())); mongoTemplate.updateFirst(new Query(Criteria.where("vin").is(vin)), update, VehiclePosition.class); } //调用推送服务接口 @@ -444,6 +446,7 @@ vehicle1.setOperatingStatus(4); vehicle1.setId(vehicle.getId()); xpVehicleClient.updateVehicleById(vehicle1); log.info("车辆故障，车辆状态修改0 {}", vehicle.getPlateNumber()); // 解绑用户与车辆关系 CancelTaxiPassengerVo cancelTaxiPassengerVo = new CancelTaxiPassengerVo(); cancelTaxiPassengerVo.setVin(vehicle.getVehicleVin()); xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/job/jobs/AddCruiseMissionJob.java
@@ -48,6 +48,7 @@ vehicle1.setState(0); vehicle1.setId(vehicle.getId()); xpVehicleClient.updateVehicleById(vehicle1); log.info("定时执行到达终点后的逻辑，车辆状态修改0 {}", vehicle.getPlateNumber()); log.info("车辆到达终点后的定时任务回滚车辆状态为空闲 {}", xpOrder.getOrderNumber()); } xpOrderService.addCruiseMission(vehicle.getId(), xpOrder); xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/job/jobs/OrderCancelJob.java
@@ -52,6 +52,7 @@ vehicle1.setId(xpVehicle.getId()); vehicle1.setState(0); xpVehicleClient.updateVehicleById(vehicle1); log.info("订单定时取消，车辆状态修改0 {}", xpVehicle.getPlateNumber()); } PushOrderDto pushOrderDto = new PushOrderDto(); xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -627,6 +627,7 @@ vehicle1.setId(vehicle.getId()); vehicle1.setState(0); xpVehicleClient.updateVehicleById(vehicle1); log.info("管理后台取消订单，车辆状态修改0 {}", vehicle.getPlateNumber()); } } } @@ -739,6 +740,7 @@ vehicle1.setId(xpVehicle.getId()); vehicle1.setState(0); xpVehicleClient.updateVehicleById(vehicle1); log.info("管理后台取消订单，车辆状态修改0 {}", xpVehicle.getPlateNumber()); } // 下发命令 @@ -995,6 +997,7 @@ vehicle1.setId(oldVehicle.getId()); vehicle1.setState(0); xpVehicleClient.updateVehicleById(vehicle1); log.info("管理后台改派订单，车辆状态修改0 {}", oldVehicle.getPlateNumber()); log.info("已将原车辆状态设为空闲，车辆ID: {}", oldVehicleId); // 6.1.4 为原车辆创建返程巡游订单 @@ -1095,6 +1098,7 @@ vehicle1.setId(newVehicle.getId()); vehicle1.setState(1); xpVehicleClient.updateVehicleById(vehicle1); log.info("管理后台改派订单，车辆状态修改1 {}", newVehicle.getPlateNumber()); log.info("已将新车辆状态设为已接单，车辆ID: {}", newVehicleId); } catch (Exception e) { @@ -1389,6 +1393,7 @@ vehicle1.setId(vehicle.getId()); vehicle1.setState(0); xpVehicleClient.updateVehicleById(vehicle1); log.info("用户取消订单，车辆状态修改0 {}", vehicle.getPlateNumber()); } } } @@ -1450,6 +1455,7 @@ vehicle1.setId(xpVehicle.getId()); vehicle1.setState(0); xpVehicleClient.updateVehicleById(vehicle1); log.info("用户取消订单，车辆状态修改0 {}", xpVehicle.getPlateNumber()); } //下发XPU报文 @@ -2903,6 +2909,7 @@ vehicle1.setId(vehicle.getId()); vehicle1.setState(1); xpVehicleClient.updateVehicleById(vehicle1); log.info("推单成功后的处理逻辑，车辆状态修改1 {}", vehicle.getPlateNumber()); //绑定用户和车辆关系 addTaxiPassengerVo.setUid(appUserId.toString()); @@ -2999,6 +3006,7 @@ vehicle1.setId(vehicle.getId()); vehicle1.setState(1); xpVehicleClient.updateVehicleById(vehicle1); log.info("推单成功后的处理逻辑，车辆状态修改1 {}", vehicle.getPlateNumber()); xpTestOrder.setVehicleId(null); xpTestOrderService.updateById(xpTestOrder); xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java
@@ -623,6 +623,7 @@ vehicle1.setId(vehicle.getId()); vehicle1.setState(0); xpVehicleClient.updateVehicleById(vehicle1); log.info("管理后台取消订单，车辆状态修改0 {}", vehicle.getPlateNumber()); } } } @@ -648,6 +649,7 @@ vehicle1.setId(xpVehicle.getId()); vehicle1.setState(0); xpVehicleClient.updateVehicleById(vehicle1); log.info("管理后台取消订单，车辆状态修改0 {}", xpVehicle.getPlateNumber()); } // 下发命令 @@ -796,6 +798,7 @@ vehicle1.setId(oldVehicle.getId()); vehicle1.setState(0); xpVehicleClient.updateVehicleById(vehicle1); log.info("改派订单，车辆状态修改0 {}", oldVehicle.getPlateNumber()); log.info("已将原车辆状态设为空闲，车辆ID: {}", oldVehicleId); } else { @@ -882,6 +885,7 @@ vehicle1.setId(newVehicle.getId()); vehicle1.setState(1); xpVehicleClient.updateVehicleById(vehicle1); log.info("改派订单，车辆状态修改1 {}", newVehicle.getPlateNumber()); log.info("已将新车辆状态设为已接单，车辆ID: {}", newVehicleId); } catch (Exception e) { xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java
@@ -320,8 +320,8 @@ String result = vehicleControlUtil.vehiclesCommand(vehiclesCommandVo, xpOrder.getAppUserId()); log.info("车辆控制结果：{}", result); JSONObject jsonObject = JSONObject.parseObject(result); Integer code = jsonObject.getInteger("code"); if (code != 0) { String msgId = jsonObject.getString("msgId"); if (StringUtils.isEmpty(msgId)) { return 0; }else { xpOrderClient.updateOrder(xpOrder); @@ -361,8 +361,8 @@ String result = vehicleControlUtil.vehiclesCommand(vehiclesCommandVo, xpOrder.getAppUserId()); log.info("车辆控制结果：{}", result); JSONObject jsonObject = JSONObject.parseObject(result); Integer code = jsonObject.getInteger("code"); if (code != 0) { String msgId = jsonObject.getString("msgId"); if (StringUtils.isEmpty(msgId)) { return 0; }else { return 1;
