java/Robotaxi.git

			@@ -1,8 +1,7 @@
			package com.xiaopeng.operation.utils;

			import cn.hutool.core.bean.BeanUtil;
			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONObject;
			import com.alibaba.fastjson2.JSON;
			import com.xiaopeng.api.dto.automaticPilot.PushOrderDto;
			import com.xiaopeng.api.dto.map.RouteAndFareDto;
			import com.xiaopeng.api.dto.operation.LonLatDto;
			@@ -26,6 +25,7 @@
			import com.xiaopeng.api.vo.operation.VehiclePositionVo;
			import com.xiaopeng.api.vo.vehicleConvoy.AddTaxiPassengerVo;
			import com.xiaopeng.common.core.constant.CacheConstants;
			import com.xiaopeng.common.core.constant.Constants;
			import com.xiaopeng.common.core.domain.R;
			import com.xiaopeng.common.redis.service.RedisService;
			import com.xiaopeng.operation.mapper.XpElectronicFenceMapper;
			@@ -44,6 +44,8 @@

			import javax.annotation.Resource;
			import java.util.*;
			import java.util.concurrent.LinkedBlockingQueue;
			import java.util.concurrent.ThreadPoolExecutor;
			import java.util.concurrent.TimeUnit;
			import java.util.stream.Collectors;

			@@ -219,7 +221,25 @@
			SendMessageDTO dto = new SendMessageDTO();
			dto.setAppUserId(xpOrder.getAppUserId().toString());
			dto.setMessage("{\"type\":\"ORDER_STATUS\",\"content\":\"{\\\"orderId\\\":\\\"" + orderId + "\\\",\\\"status\\\":0}\",\"timestamp\":\"" + System.currentTimeMillis() + "\"}");
			xpPushMessageClient.sendStatus(dto);
			R<String> stringR = xpPushMessageClient.sendStatus(dto);
			//推送失败，重试3次
			if(stringR.getCode() != Constants.SUCCESS){
			ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>());
			executor.execute(() -> {
			for (int i = 0; i < 3; i++) {
			R<String> stringR1 = xpPushMessageClient.sendStatus(dto);
			if(stringR1.getCode() == Constants.SUCCESS){
			break;
			}
			try {
			Thread.sleep(1000);
			} catch (InterruptedException e) {
			throw new RuntimeException(e);
			}
			log.info("五轮推单结束后，无车辆接单，推送取消消息失败：{} {} {}", stringR1.getMsg(), JSON.toJSONString(dto), xpOrder.getOrderNumber());
			}
			});
			}
			//将订单从队列中移除
			log.info("五轮推单结束，无车辆接单，执行队列移除订单 {}", orderNo);
			redisService.popFirstElement(quoteName);
			@@ -287,7 +307,6 @@

			// 找出符合条件的
			availableVehiclesNearby = availableVehiclesNearby.stream().filter(e -> data.contains(e.getVin())).collect(Collectors.toList());

			// List<VehiclePositionVo> availableVehiclesNearby =vehiclePositionVos.getData();

			if (!availableVehiclesNearby.isEmpty()) {
			@@ -502,15 +521,23 @@
			vehiclePosition.setDistance(0.0);
			}
			}
			// availableVehiclesNearby = availableVehiclesNearby.stream().sorted(Comparator.comparing(VehiclePositionVo::getDistance)).collect(Collectors.toList());
			// int size = tendencyDistance;
			// // 做比对的分数
			// double temp = availableVehiclesNearby.get(0).getDistance();
			// for (VehiclePositionVo vehiclePosition : availableVehiclesNearby) {
			// vehiclePosition.setDistanceScore(vehiclePosition.getDistanceScore() + size);
			// if (temp != vehiclePosition.getDistance()) {
			// size--;
			// }
			// }

			// 分数计算把时间短的分数调高
			availableVehiclesNearby = availableVehiclesNearby.stream().sorted(Comparator.comparing(VehiclePositionVo::getDistance)).collect(Collectors.toList());
			int size = tendencyDistance;
			// 做比对的分数
			double temp = availableVehiclesNearby.get(0).getDistance();
			int score = 10;
			for (VehiclePositionVo vehiclePosition : availableVehiclesNearby) {
			vehiclePosition.setDistanceScore(vehiclePosition.getDistanceScore() + size);
			if (temp != vehiclePosition.getDistance()) {
			size--;
			}
			vehiclePosition.setDistanceScore(score);
			score--;
			}
			}

			@@ -539,16 +566,24 @@
			vehiclePosition.setSecond(0);
			}
			}

			// 分数计算把时间短的分数调高
			availableVehiclesNearby = availableVehiclesNearby.stream().sorted(Comparator.comparing(VehiclePositionVo::getSecond)).collect(Collectors.toList());
			int size = tendencyTime;
			// 做比对的分数
			double temp = availableVehiclesNearby.get(0).getSecond();
			int score = 10;
			for (VehiclePositionVo vehiclePosition : availableVehiclesNearby) {
			vehiclePosition.setTimeScore(vehiclePosition.getTimeScore() + size);
			if (temp != vehiclePosition.getSecond()) {
			size--;
			}
			vehiclePosition.setTimeScore(score);
			score--;
			}
			// availableVehiclesNearby = availableVehiclesNearby.stream().sorted(Comparator.comparing(VehiclePositionVo::getSecond)).collect(Collectors.toList());
			// int size = tendencyTime;
			// // 做比对的分数
			// double temp = availableVehiclesNearby.get(0).getSecond();
			// for (VehiclePositionVo vehiclePosition : availableVehiclesNearby) {
			// vehiclePosition.setTimeScore(vehiclePosition.getTimeScore() + size);
			// if (temp != vehiclePosition.getSecond()) {
			// size--;
			// }
			// }

			}

			@@ -831,7 +866,6 @@
			}
			XpVehicle vehiclePosition = vehiclePositionR.getData();
			log.info("符合条件的车辆 {} ，直接推单XPU。单号 {}", vehiclePosition.getPlateNumber(), orderNo);
			System.err.println("符合条件的车辆!!!!!!!!!!!!"+vehiclePosition.getPlateNumber());
			log.info("当前车辆状态 {} 单号 {}", vehiclePosition.getStatus(), orderNo);
			if (vehiclePosition.getOperatingStatus() != 1 \|\| vehiclePosition.getState() != 0 \|\| vehiclePosition.getVehicleType() == 1) {
			continue;