Merge remote-tracking branch 'origin/1.0' into 1.0

liujie

2026-04-18 b92a2bf0fdb56b51066c2d484f8880d1b05941de

 xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/controller/WebSocketController.java

@@ -1,6 +1,5 @@
package com.xiaopeng.pushMessage.webSocket.controller;

import com.alibaba.fastjson.JSONObject;
import com.xiaopeng.api.dto.pushMessage.SendMessageDTO;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.controller.BaseController;
@@ -41,7 +40,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 +98,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 +132,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 +166,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();