From 2aa8fe3c4cb92c83ba886f0d08b76e98f0dc4de6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 26 四月 2026 10:16:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/controller/WebSocketController.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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 96bddf7..f949ecb 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
@@ -1,7 +1,9 @@
package com.xiaopeng.pushMessage.webSocket.controller;
-import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.xiaopeng.api.dto.pushMessage.SendMessageDTO;
+import com.xiaopeng.api.vo.XpTaskVO;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.controller.BaseController;
import com.xiaopeng.pushMessage.webSocket.service.WebSocketUserService;
@@ -11,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -29,6 +32,8 @@
@Autowired
private WebSocketUserService webSocketUserService;
+ @Autowired ObjectMapper om;
+
// ==================== 基于XpAppUser的WebSocket接口 ====================
// 消息格式 "{\"type\":\"mission_push\",\"content\":\"{\"missionId\":\"1983875114637811713\"}\",\"timestamp\":\"2025-10-27T09:22:45.681\"}";
@@ -41,7 +46,7 @@
* @return 操作结果
*/
@ApiOperation(value = "发送订单状态")
- @PostMapping("/logan/inner/websocket/order/sendStatus")
+ @PostMapping("/inner/websocket/order/sendStatus")
public R<String> sendStatus(@RequestBody SendMessageDTO dto) {
try {
String message = dto.getMessage();
@@ -99,7 +104,7 @@
* @return 操作结果
*/
@ApiOperation(value = "发送车辆路线、时间")
- @PostMapping("/logan/inner/websocket/order/sendRoute")
+ @PostMapping("/inner/websocket/order/sendRoute")
public R<String> sendRoute(@RequestBody SendMessageDTO dto) {
try {
String message = dto.getMessage();
@@ -133,7 +138,7 @@
* @return 操作结果
*/
@ApiOperation(value = "发送车辆实时定位")
- @PostMapping("/logan/inner/websocket/order/sendVehicleLocation")
+ @PostMapping("/inner/websocket/order/sendVehicleLocation")
public R<String> sendVehicleLocation(@RequestBody SendMessageDTO dto) {
try {
String message = dto.getMessage();
@@ -167,7 +172,7 @@
* @return 操作结果
*/
@ApiOperation(value = "发送是否开启倒计时")
- @PostMapping("/logan/inner/websocket/order/sendOpenTrunk")
+ @PostMapping("/inner/websocket/order/sendOpenTrunk")
public R<String> sendOpenTrunk(@RequestBody SendMessageDTO dto) {
try {
String message = dto.getMessage();
@@ -356,4 +361,21 @@
return R.fail("获取在线用户列表失败: " + e.getMessage());
}
}
+
+
+ /**
+ * 运维工单app推送
+ */
+ @PostMapping("/inner/websocket/push/task")
+ public R<?> pushTask(@RequestBody XpTaskVO vo) throws JsonProcessingException {
+
+ String handleUserId = vo.getHandleUserId();
+ Map<String, Object> msg = new HashMap<>();
+ msg.put("type", "task");
+ msg.put("data", vo);
+ webSocketUserService.sendMessageToUser(handleUserId, om.writeValueAsString(msg));
+ return R.ok();
+
+ }
+
}
\ No newline at end of file
--
Gitblit v1.7.1