java/Robotaxi.git

			@@ -229,7 +229,7 @@
			xpOrder.setTestPlanId(query.getTestPlanId());
			xpOrder.setOrderType(query.getOrderType());
			xpOrder.setMileageKilometers(0.0);
			xpOrder.setOrderNumber("XP" + System.currentTimeMillis());
			xpOrder.setOrderNumber(getOrderNumber());
			xpOrder.setCityId(openCity.getId());
			xpOrder.setPlacementLat(xpPoint.getPointLat());
			xpOrder.setPlacementLon(xpPoint.getPointLon());
			@@ -294,6 +294,12 @@
			orderMissionClient.pushOrder(pushOrderDto);
			}
			}

			private String getOrderNumber(){
			int random = Double.valueOf(Math.random() * 1000).intValue();
			return "XP" + random + System.currentTimeMillis();
			}


			private Boolean isInOperationTime(String operationStrategy) {
			JSONArray jsonArray = JSONArray.parseArray(operationStrategy);
			@@ -647,6 +653,7 @@

			// 下发命令
			PushOrderDto pushOrderDto = new PushOrderDto();
			pushOrderDto.setEndTaskId(order.getStatus() < 6 ? order.getXpuStartTaskId() : order.getXpuEndTaskId());
			pushOrderDto.setOrderId("TEST" + order.getId().toString());
			pushOrderDto.setVin(vin);
			pushOrderDto.setOperation_type(OrderOperationType.CLOUD_CANCEL_ORDER);
			@@ -689,6 +696,7 @@

			//给XPU推送订单取消的报文
			PushOrderDto pushOrderDto = new PushOrderDto();
			pushOrderDto.setEndTaskId(order.getStatus() < 6 ? order.getXpuStartTaskId() : order.getXpuEndTaskId());
			pushOrderDto.setOrderId("TEST" + order.getId().toString());
			pushOrderDto.setVin(vin);
			pushOrderDto.setOperation_type(OrderOperationType.CLOUD_CANCEL_ORDER);
			@@ -729,6 +737,7 @@

			//给XPU推送订单取消的报文
			PushOrderDto pushOrderDto = new PushOrderDto();
			pushOrderDto.setEndTaskId(order.getStatus() < 6 ? order.getXpuStartTaskId() : order.getXpuEndTaskId());
			pushOrderDto.setOrderId("TEST" + order.getId().toString());
			pushOrderDto.setVin(vin);
			pushOrderDto.setOperation_type(OrderOperationType.CLOUD_CANCEL_ORDER);
			@@ -1624,6 +1633,7 @@
			XpVehicle xpVehicle = xpVehicleClient.queryById(xpTestOrder.getVehicleId()).getData();
			String vin = SensitiveDataCryptoUtil.decryptIfPossible(xpVehicle.getVehicleVin());
			PushOrderDto pushOrderDto = new PushOrderDto();
			pushOrderDto.setEndTaskId(xpTestOrder.getStatus() < 6 ? xpTestOrder.getXpuStartTaskId() : xpTestOrder.getXpuEndTaskId());
			pushOrderDto.setVin(vin);
			pushOrderDto.setOrderId("TEST" + xpTestOrder.getId());
			pushOrderDto.setOperation_type(OrderOperationType.CLOUD_CANCEL_ORDER);