From 11e55e11d3d3397cd2b54a65b2cda202be822296 Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期四, 30 四月 2026 09:21:54 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/controller/WebSocketController.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 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 c5cb1b8..476cc9e 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,11 +1,9 @@
package com.xiaopeng.pushMessage.webSocket.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.xiaopeng.api.dto.pushMessage.SendMessageDTO;
-import com.xiaopeng.api.vo.TaskVO;
+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;
@@ -15,7 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.PostConstruct;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -34,15 +32,7 @@
@Autowired
private WebSocketUserService webSocketUserService;
- private ObjectMapper om;
-
- @PostConstruct
- void setupObjectMapper() {
- // 允许对象忽略json中不存在的属性
- om = new ObjectMapper();
- om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
- om.registerModule(new JavaTimeModule());
- }
+ @Autowired ObjectMapper om;
// ==================== 基于XpAppUser的WebSocket接口 ====================
@@ -56,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();
@@ -377,12 +367,15 @@
* 运维工单app推送
*/
@PostMapping("/inner/websocket/push/task")
- public R<?> pushTask(@RequestBody TaskVO vo) throws JsonProcessingException {
+ public R<?> pushTask(@RequestBody XpTaskVO vo) throws JsonProcessingException {
String handleUserId = vo.getHandleUserId();
- String msg = om.writeValueAsString(vo);
- webSocketUserService.sendMessageToUser(handleUserId, msg);
+ 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