java/Robotaxi.git

			@@ -26,6 +26,7 @@
			import com.xiaopeng.api.vo.order.OrderTrajectoryVo;
			import com.xiaopeng.automaticPilot.util.XPUUtil;
			import com.xiaopeng.common.core.domain.R;
			import com.xiaopeng.common.core.enums.CancelOrderSceneEnum;
			import com.xiaopeng.common.core.enums.OrderStatusEnum;
			import com.xiaopeng.common.core.enums.PushMessageTypeEnum;
			import com.xiaopeng.common.core.utils.StringUtils;
			@@ -265,13 +266,7 @@
			if(null != mqttPublishDto && mqttPublishDto.getCode() == 200){
			JSONObject jsonObject = new JSONObject();
			jsonObject.put("event", SystemEventType.CREATE_ORDER);
			if(dto.getOrderId().contains("XU")){
			jsonObject.put("orderType", com.xiaopeng.api.vo.OrderType.CRUISE_ORDER);
			}else if(dto.getOrderId().contains("TEST")){
			jsonObject.put("orderType", com.xiaopeng.api.vo.OrderType.TEST_ORDER);
			}else {
			jsonObject.put("orderType", com.xiaopeng.api.vo.OrderType.USER_ORDER);
			}
			jsonObject.put("orderType", dto.getOrderType());
			jsonObject.put("orderId", dto.getOrderId());
			jsonObject.put("vin", dto.getVin());
			redisService.setCacheObject("CREATE_ORDER:" + dto.getOrderId().toString(), jsonObject.toJSONString(),30L, TimeUnit.MINUTES);
			@@ -282,9 +277,10 @@

			@PostMapping("/inner/cancelOrder")
			R<Boolean> cancelOrder(@RequestBody PushOrderDto dto) {
			String taskId = StringUtils.isNotEmpty(dto.getTaskId()) ? dto.getTaskId() : snowflake.nextId() + "";
			OrderOperation.Builder operationBuilder = OrderOperation.newBuilder();
			operationBuilder.setOrderId(dto.getOrderId().toString());
			operationBuilder.setTaskId(snowflake.nextId() + "");
			operationBuilder.setTaskId(taskId);
			if (dto.getOperation_type() != null) {
			operationBuilder.setOperationType(OrderOperationType.forNumber(dto.getOperation_type().getNumber()));
			}
			@@ -294,8 +290,16 @@

			if (mqttPublishDto.getCode() == 200) {
			if(!dto.getOrderId().contains("XU")){
			// 正常订单处理
			redisService.setCacheObject(String.valueOf(sequence), "cancelOrder_" + dto.getOrderId() + "_" + dto.getVin(), 30l, TimeUnit.MINUTES);
			Map<String, Object> cancelContext = new HashMap<>();
			cancelContext.put("orderId", dto.getOrderId());
			cancelContext.put("vin", dto.getVin());
			cancelContext.put("cancelScene", StringUtils.isNotEmpty(dto.getCancelScene())
			? dto.getCancelScene()
			: CancelOrderSceneEnum.NORMAL_CANCEL.getCode());
			redisService.setCacheObject("CANCEL_ORDER_CONTEXT:" + taskId,
			JSONObject.toJSONString(cancelContext), 30L, TimeUnit.MINUTES);
			log.info("记录取消订单上下文成功，orderId: {}, vin: {}, taskId: {}, cancelScene: {}",
			dto.getOrderId(), dto.getVin(), taskId, cancelContext.get("cancelScene"));
			}
			return R.ok(true);
			}