Merge remote-tracking branch 'origin/master'

puzhibing

2026-02-27 77926eb024b921ba31058e62b23ba910cfc36eb9

Merge remote-tracking branch 'origin/master'

 xp-robotaxi-account-boot/src/main/resources/mapper/account/XpOperationsUserMapper.xml

@@ -33,7 +33,7 @@
        xou.training_graduation_certificate, xou.is_deleted, xou.create_time, xou.update_time, xou.create_by
            from xp_operations_user xou
        left join xp_operations_role xor on xou.id = xor.operations_user_id
        <where>
        where xou.is_deleted = 0
            <if test="query.nickName != null and query.nickName != ''">
                and xou.nick_name like concat('%',#{query.nickName},'%')
            </if>
@@ -46,8 +46,8 @@
            <if test="query.status != null">
                and xou.status = #{query.status}
            </if>
            AND xou.is_deleted = 0
        </where>


        order by xou.create_time desc
    </select>


 xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/RtMsgHeader.java

@@ -1,8 +1,9 @@
package com.xiaopeng.api.vo.automaticPilot.proto.up;

import com.xiaopeng.api.vo.automaticPilot.proto.down.RTCmdType;
import com.xiaopeng.api.vo.automaticPilot.proto.down.SourceType;

import com.xiaopeng.api.vo.automaticPilot.protobuf.RTCmdType;import lombok.Data;
import lombok.Data;

/**
 * 消息头

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpNotificationController.java

@@ -8,14 +8,10 @@
import com.xiaopeng.operation.service.IXpNotificationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.*;

import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;


 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpRideGuideController.java

@@ -29,7 +29,7 @@
    }


    @ApiOperation(value = "获取乘车指南",tags = {"小程序首页"},response = XpAgreementVo.class)
    @ApiOperation(value = "获取乘车指南",tags = {"小程序首页-获取乘车指南"},response = XpRideGuideVo.class)
    @GetMapping("/base/v1/mini-program/guide/list")
    public AjaxResult<XpRideGuideVo> getList() {
        return success(xpRideGuideService.getXpRideGuideList());

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpRideGuideServiceImpl.java

@@ -57,7 +57,7 @@
    @Override
    public void saveGuide(XpRideGuideDTO dto) {
        //根据类型删除已配置的乘车指南
        lambdaUpdate().eq(XpRideGuide::getGuideType, dto.getGuideList().get(0).getGuideType()).remove();
        lambdaUpdate().remove();
        List<XpRideGuide> guideList = dto.getGuideList();
        List<XpRideGuide> xpRideGuides = BeanUtil.copyToList(guideList, XpRideGuide.class);
        saveBatch(xpRideGuides);

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/vo/XpRideGuideNextVo.java

@@ -22,4 +22,8 @@
    @ApiModelProperty(value = "序列号(步骤)")
    private Integer serialNumber;


    @ApiModelProperty(value = "类型 1步骤 2长图")
    private Integer guideType;

}

 xp-robotaxi-operation-boot/src/main/resources/mapper/operation/XpRideGuideMapper.xml

@@ -22,9 +22,9 @@
        id, guide_step, guide_title, guide_content, guide_image, guide_type, is_deleted, create_time, update_time, create_by, update_by
    </sql>
    <select id="getXpRideGuideList" resultType="com.xiaopeng.operation.vo.XpRideGuideNextVo">
        select id,guide_step as serialNumber,guide_title as  name,guide_image as bannerImage
        select id,guide_step as serialNumber,guide_title as  name,guide_image as bannerImage,guide_type
        from xp_ride_guide
        where is_deleted = 0
        where is_deleted = 0 and guide_type =2
        order by guide_step

    </select>