From 560be817c1342d4da523760ba38433c4c0f52983 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 五月 2026 10:56:09 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.1

---
 xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/controller/WebSocketController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/controller/WebSocketController.java b/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/controller/WebSocketController.java
index 873c7fe..e2cd128 100644
--- a/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/controller/WebSocketController.java
+++ b/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/controller/WebSocketController.java
@@ -46,7 +46,7 @@
      * @return 操作结果
      */
     @ApiOperation(value = "发送订单状态")
-    @PostMapping("/inner/websocket/order/sendStatus")
+    @PostMapping("/logan/inner/websocket/order/sendStatus")
     public R<String> sendStatus(@RequestBody SendMessageDTO dto) {
         try {
             String message = dto.getMessage();
@@ -104,7 +104,7 @@
      * @return 操作结果
      */
     @ApiOperation(value = "发送车辆路线、时间")
-    @PostMapping("/inner/websocket/order/sendRoute")
+    @PostMapping("/logan/inner/websocket/order/sendRoute")
     public R<String> sendRoute(@RequestBody SendMessageDTO dto) {
         try {
             String message = dto.getMessage();
@@ -370,7 +370,7 @@
     public R<?> pushTask(@RequestBody XpTaskVO vo) throws JsonProcessingException {
 
         String handleUserId = vo.getHandleUserId();
-        Map<String, Object> msg = new HashMap();
+        Map<String, Object> msg = new HashMap<>();
         msg.put("type", "task");
         msg.put("data", vo);
         webSocketUserService.sendMessageToUser(handleUserId, om.writeValueAsString(msg));

--
Gitblit v1.7.1