java/Robotaxi.git

			@@ -31,12 +31,8 @@
			@ApiModelProperty(value = "剩余时间")
			private Integer duration;

			@NotNull(message = "用户id不能为空")
			@ApiModelProperty(value = "用户id")
			private Long appUserId;

			@NotNull(message = "轨迹类型不能为空")
			@ApiModelProperty(value = "轨迹类型 1=接单轨迹 2=服务轨迹 3=巡游轨迹")
			@NotNull(message = "订单类型不能为空")
			@ApiModelProperty(value = "订单类型 1=实时订单 2=巡游订单")
			private Integer routeType;

			}

			@@ -32,6 +32,8 @@
			private RedisService redisService;
			@Autowired
			private XpPushMessageClient xpPushMessageClient;
			@Autowired
			private XpOrderClient xpOrderClient;

			/**
			* 通过定位推送订单轨迹
			@@ -40,9 +42,13 @@
			@PostMapping("/inner/v1/order/pushOrderRoute")
			public R<String> pushOrderRoute(@Validated @RequestBody PushOrderRouteDTO dto) {

			// 获取路线规划
			RouteVo routeVo = redisService.getCacheObject(CacheConstants.ORDER_ROUTE_CAPTURE + "_" + dto.getOrderId() + "_" +dto.getRouteType());

			if(Objects.nonNull(routeVo)){

			// 查询订单信息
			XpOrder xpOrder = xpOrderClient.queryOrderById(dto.getOrderId()).getData();

			// 计算实时点位到线段的最优截取
			List<LonLatDto> lonLatDtos = MapMatchingUtil.clipBySegmentDistance(routeVo.getPolyline(), new LonLatDto(dto.getLongitude(), dto.getLatitude()));
			@@ -67,9 +73,15 @@
			route.put("polyline",JSONObject.toJSONString(polyline));

			// 封装消息内容
			Integer routeType = dto.getRouteType();
			if(routeType == 2){
			routeType = 3;
			}else {
			routeType = xpOrder.getStatus() == 4 ? 1 : 2;
			}
			Map<String, Object> content = new HashMap<>();
			content.put("orderId",dto.getOrderId());
			content.put("routeType",dto.getRouteType());
			content.put("routeType",routeType);
			content.put("route",JSONObject.toJSONString(route));

			// 封装轨迹信息
			@@ -80,7 +92,7 @@

			// 进行消息推送
			SendMessageDTO sendMessageDTO = new SendMessageDTO();
			sendMessageDTO.setAppUserId(String.valueOf(dto.getAppUserId()));
			sendMessageDTO.setAppUserId(String.valueOf(xpOrder.getAppUserId()));
			sendMessageDTO.setMessage(JSONObject.toJSONString(params));
			xpPushMessageClient.sendRoute(sendMessageDTO);
			}

	xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/pushMessage/PushOrderRouteDTO.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-pushMessage-boot/src/main/java/com/xiaopeng/pushMessage/controller/PushOrderRouteController.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史