From 01fe113711578471cc11a43fac6a3f5e630759fc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 五月 2026 22:09:08 +0800
Subject: [PATCH] 合并线上代码
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
index b056e11..798180b 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
@@ -36,6 +36,7 @@
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.redis.service.RedisService;
import com.xiaopeng.common.security.service.TokenService;
+import com.xiaopeng.order.config.BluetoothDebugConfig;
import com.xiaopeng.order.dto.OrderNavigationDto;
import com.xiaopeng.api.model.order.OrderTrajectory;
import com.xiaopeng.order.model.dto.XpOrderCommentDto;
@@ -112,6 +113,10 @@
@Resource
private TokenService tokenService;
+
+ @Autowired
+ private BluetoothDebugConfig bluetoothDebugConfig;
+
/**
@@ -707,6 +712,18 @@
@GetMapping("/api/v1/mini-program/bluetooth/getUnlocktToken/{orderId}")
@XpClientCheck(checkToken = false, checkOtpToken = true)
public R<BluetoothTokenVo> getBluetoothToken(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
+
+ // ========== 联调临时逻辑：通过 Nacos 配置返回固定蓝牙信息（bluetooth-debug.enabled=true 时生效） ==========
+ if (bluetoothDebugConfig.isEnabled()) {
+ BluetoothTokenVo vo = new BluetoothTokenVo();
+ vo.setToken(bluetoothDebugConfig.getToken());
+ vo.setMacAddress(bluetoothDebugConfig.getMacAddress());
+ vo.setSlaveMacList(bluetoothDebugConfig.getSlaveMacList());
+ return R.ok(vo);
+ }
+ // ========== 联调临时逻辑结束 ==========
+
+ // 原逻辑
String uid = request.getHeader("XP-Uid");
XpOrder xpOrder = xpOrderService.getById(orderId);
if (!Objects.equals(xpOrder.getAppUserId(), Long.valueOf(uid))) {
--
Gitblit v1.7.1