java/Robotaxi.git

			@@ -469,6 +469,7 @@

			// 判断当天取消的次数后台配置 redis 查询
			Object cancelOrder = redisService.getCacheObject("CANCEL_ORDER_" + uid);
			log.info("取消次数：{}", cancelOrder);
			// 静默处理
			boolean isSilent = false;
			if (cancelOrder != null) {
			@@ -501,7 +502,7 @@
			// 生成订单数据
			XpOrder xpOrder = new XpOrder();

			xpOrder.setVehicleId(1l);
			// xpOrder.setVehicleId(1l);

			// xpOrder.setStartMileage(Double.valueOf(startMileage));

			@@ -589,18 +590,23 @@

			// 找出现在所有的队列通过计算距离算出目前应该放在那个队列如果没有符合的新增一个队列符合后看是否白名单账号是则直接放在队列前端
			Set<String> quoteMatchName = redisService.getQuoteMatchName(CacheConstants.QUEUE_POINT_ID);
			log.info("当前队列：{}", quoteMatchName);
			for (String s : quoteMatchName) {
			// QUEUE_POINT_ID-1-30.233,120.233
			String lonLat = s.split("-")[2];
			// 和上车点进行判断是否<maxPushDistance
			double v = FastDistanceCalculator.distanceFast(Double.parseDouble(lonLat.split(",")[1]), Double.parseDouble(lonLat.split(",")[0]), xpPoint.getPointLat(), xpPoint.getPointLon());
			if (v < maxPushDistance) {
			String value = orderId + "_" + xpPoint.getPointLon() + "," + xpPoint.getPointLat() + "_0" + "_" + uid + "_" + xpOrder.getOrderNumber() + "_" + distance + "_" + duration + "_" + routeAndFareDto.getRoutePlanRule();
			if (isPriorityDispatch) {
			// 头部 value 订单_经纬度_状态_用户id_订单编号_距离_时间
			redisService.addToHead(s, orderId + "_" + xpPoint.getPointLon() + "," + xpPoint.getPointLat() + "_0" + "_" + uid + "_" + xpOrder.getOrderNumber() + "_" + distance + "_" + duration + "_" + routeAndFareDto.getRoutePlanRule());
			// redisService.addToHead(s, orderId + "_" + xpPoint.getPointLon() + "," + xpPoint.getPointLat() + "_0" + "_" + uid + "_" + xpOrder.getOrderNumber() + "_" + distance + "_" + duration + "_" + routeAndFareDto.getRoutePlanRule());
			redisService.addToHead(s, value);
			log.info("添加到队列头部：{} {}", s, value);
			} else {
			// 尾部
			redisService.addToTail(s, orderId + "_" + xpPoint.getPointLon() + "," + xpPoint.getPointLat() + "_0" + "_" + uid + "_" + xpOrder.getOrderNumber() + "_" + distance + "_" + duration + "_" + routeAndFareDto.getRoutePlanRule());
			redisService.addToTail(s, value);
			log.info("添加到队列头部：{} {}", s, value);
			}
			xpOrder.setQueueName(s);
			xpOrderClient.updateOrder(xpOrder);
			@@ -621,6 +627,7 @@

			String key = CacheConstants.QUEUE_POINT_ID + "-" + xpPoint.getId() + "-" + xpPoint.getPointLon() + "," + xpPoint.getPointLat();
			redisService.setCacheList(key, Arrays.asList(orderId + "_" + xpPoint.getPointLon() + "," + xpPoint.getPointLat() + "_0" + "_" + uid + "_" + xpOrder.getOrderNumber() + "_" + distance + "_" + duration + "_" + routeAndFareDto.getRoutePlanRule()));
			log.info("订单推单：{} {}", key, redisService.getCacheList(key));
			xpOrder.setQueueName(key);
			xpOrderClient.updateOrder(xpOrder);

	xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/KafkaTestController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/XpPricingServiceImpl.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -1,9 +1,11 @@
			package com.xiaopeng.automaticPilot.controller;

			import com.xiaopeng.automaticPilot.service.KafkaConsumerService;
			import com.xiaopeng.common.core.domain.R;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.kafka.annotation.KafkaListener;
			import org.springframework.web.bind.annotation.PostMapping;
			import org.springframework.web.bind.annotation.RestController;