1.修改bug 路线，用户路线偏好，改派等

yyy

2026-05-08 112dcf66d6b9e95e7b8d6ae0e08eaf0104204052

1.修改bug 路线，用户路线偏好，改派等

 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpUserRoutePlanRuleController.java

@@ -2,12 +2,20 @@


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.xiaopeng.account.model.vo.XpAppUserCouponListVo;
import com.xiaopeng.account.service.IXpUserRoutePlanRuleService;
import com.xiaopeng.api.model.account.XpUserRoutePlanRule;
import com.xiaopeng.api.query.account.XpAppUserCouponPageListQuery;
import com.xiaopeng.api.vo.operation.RoutePreferenceItemVo;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.unifiedverification.interceptor.XpClientCheck;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;


/**
@@ -33,4 +41,15 @@
        return R.ok(one);
    }


    @PostMapping("/v1/api/mini-program/userRoutePlanRule/getXpUserRoutePlanRule")
    @ApiOperation(value = "获取用户导航偏好设置",tags = {"小程序-获取用户导航偏好设置"},response = XpUserRoutePlanRule.class)
    @XpClientCheck(checkToken = false, checkOtpToken = true)
    public R<XpUserRoutePlanRule> listRoutePreferences( HttpServletRequest request) {
        String uid = request.getHeader("XP-Uid");
        XpUserRoutePlanRule one = xpUserRoutePlanRuleService.getOne(new LambdaQueryWrapper<XpUserRoutePlanRule>().eq(XpUserRoutePlanRule::getUserId, uid)
                .eq(XpUserRoutePlanRule::getDeleted, 0));
        return R.ok(one);
    }

}

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

@@ -135,7 +135,19 @@

        </where>
        GROUP BY u.id
        ORDER BY u.create_time DESC
        <choose>
            <when test="query.orderByField != null and  query.orderByField == 1">
                ORDER BY FIELD
                <foreach collection="query.ids" item="id" open=" (u.id," separator="," close=")">
                    #{id}
                </foreach>
            </when>
            <otherwise>
                ORDER BY u.create_time DESC
            </otherwise>
        </choose>


    </select>

</mapper>

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/account/XpOperationsUserPositionDTO.java

@@ -11,6 +11,9 @@
import org.springframework.data.mongodb.core.index.GeoSpatialIndexType;
import org.springframework.data.mongodb.core.index.GeoSpatialIndexed;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.format.annotation.DateTimeFormat;

import java.time.LocalDateTime;

/**
 * 运维人员查询条件DTO
@@ -36,6 +39,10 @@
    @ApiModelProperty(value = "纬度")
    private double longitude;


    @ApiModelProperty(value = "时间")
    private Long updateTime;

    @GeoSpatialIndexed(type = GeoSpatialIndexType.GEO_2DSPHERE)
    private GeoJsonPoint location;


 xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/vehicleConvoy/XpFleetOperationsClientFallbackFactory.java

@@ -5,10 +5,16 @@
import com.xiaopeng.api.model.vehicleConvoy.XpFleetOperations;
import com.xiaopeng.common.core.domain.R;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

/**
@@ -37,6 +43,12 @@
            }

            @Override
            public R<List<XpFleetOperations>> findListByUserIds(@RequestBody List<Long> userIds){
                log.error("根据人员id 获取所属车队，人员IDs: {}，原因: {}", userIds.toString(), cause.getMessage());
                return R.ok(new ArrayList<>());
            }

            @Override
            public R<List<Long>> getFleetIdsByUserId(Long userId) {
                log.error("根据人员ID获取车队信息失败 {}",  cause.getMessage());
                return R.fail("根据人员ID获取车队信息失败");

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/vehicleConvoy/XpFleetOperationsClient.java

@@ -42,6 +42,14 @@
    R<List<XpFleet>> getFleetByUserId(@PathVariable("id") Long id);

    /**
     * 根据人员id 获取所属车队
     * @param userIds 运维人员id
     * @return
     */
    @PostMapping("/logan/inner/fleet-operations/findListByUserIds")
    R<List<XpFleetOperations>> findListByUserIds(@RequestBody List<Long> userIds);

    /**
     * 根据运维人员ID查询关联的车队ID列表
     *
     * @param userId 运维人员ID

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/vehicleConvoy/XpFleetOperations.java

@@ -1,5 +1,6 @@
package com.xiaopeng.api.model.vehicleConvoy;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -35,4 +36,8 @@
    private Long operationsUserId;


    @ApiModelProperty(value = "车队名称")
    @TableField(exist = false)
    private String fleetName;

}

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/query/account/OptionalUsersPageListQuery.java

@@ -18,4 +18,7 @@

    List<Long> ids;

    //null默认 1=ids
    Integer orderByField;

}

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/account/XpOperationsUserWithRoleVO.java

@@ -24,4 +24,8 @@

    @ApiModelProperty(value = "和事故地点距离")
    private Double dis;

    @ApiModelProperty(value = "车队名")
    private String fleetName;

}

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/operation/MultiRouteAndFareVo.java

@@ -32,4 +32,5 @@
    private Double priceWaveThresholdPercent;
    @ApiModelProperty(value = "是否开启试运营（0=否，1=是）")
    private Integer operateFree;

}

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/operation/RouteOptionVo.java

@@ -39,4 +39,7 @@

    @ApiModelProperty("优惠券不可用时的提示（无可用券时）")
    private String couponMessage;

    @ApiModelProperty(value = "策略id")
    private Integer amapStrategy;
}

 xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/XpPricingServiceImpl.java

@@ -1186,6 +1186,7 @@
                opt.setCouponMessage("当前路线不满足优惠券使用条件");
            }
            opt.setOperateFree(operateFree);
            opt.setAmapStrategy(pricingDto.getRoutePlanRule());
            options.add(opt);
        }


 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java

@@ -3,6 +3,8 @@

import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.xiaopeng.api.dto.account.XpOperationsUserPositionDTO;
@@ -14,6 +16,8 @@
import com.xiaopeng.api.model.maintenance.XpErrorType;
import com.xiaopeng.api.model.maintenance.XpTask;
import com.xiaopeng.api.model.maintenance.XpTaskRule;
import com.xiaopeng.api.model.vehicleConvoy.XpFleet;
import com.xiaopeng.api.model.vehicleConvoy.XpFleetOperations;
import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
import com.xiaopeng.api.query.account.OptionalUsersPageListQuery;
import com.xiaopeng.api.vo.XpTaskVO;
@@ -21,6 +25,7 @@
import com.xiaopeng.api.vo.account.XpOperationsUserWithRoleVO;
import com.xiaopeng.api.vo.automaticPilot.VehiclePosition;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.security.service.TokenService;
import com.xiaopeng.evi.oss.service.AliOssService;
@@ -65,6 +70,7 @@
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;

/**
@@ -370,27 +376,64 @@
        Query query = Query.query(new Criteria().andOperator(
                Criteria.where("location").withinSphere(circle)
        ));
        // 增加时间查询条件：最近1分钟更新的数据
        int  time = 10*60*1000;
        Long oneMinuteAgo = System.currentTimeMillis() - time;
        query.addCriteria(Criteria.where("updateTime").gte(oneMinuteAgo));
        
        List<XpOperationsUserPositionDTO> vehiclePositions = mongoTemplate.find(query, XpOperationsUserPositionDTO.class);
        Map<Long, Double> disMap = vehiclePositions.stream().collect(Collectors.toMap(XpOperationsUserPositionDTO::getId, XpOperationsUserPositionDTO::getDistance));

        // 查询车队下面面所有人员id和up求交集
        List<Long> data = xpFleetClient.idsByFleetName(query1.getFleet()).getData();

        List<Long> ids = vehiclePositions.stream().map(XpOperationsUserPositionDTO::getId)
                .filter(e -> data == null || data.isEmpty() || data.contains(e))
                .collect(Collectors.toList());

        if(CollUtil.isEmpty(vehiclePositions)){
            throw new ServiceException("未查询到运维人员");
        }
        List<Long> data = null ;
        if(StrUtil.isNotBlank(query1.getFleet())){
            // 查询车队下面面所有人员id和up求交集
            data = xpFleetClient.idsByFleetName(query1.getFleet()).getData();
        }
        //vehiclePositions根据距离升序排序
        vehiclePositions.sort(Comparator.comparing(XpOperationsUserPositionDTO::getDistance));
        //获取运维人员id
        List<Long> ids = new ArrayList<>();
        Map<Long, Double> disMap = new HashMap<>();
        if (  CollUtil.isNotEmpty(data)  ) {
            for (XpOperationsUserPositionDTO vehiclePosition : vehiclePositions) {
                if(data.contains(vehiclePosition.getId())){
                    ids.add(vehiclePosition.getId());
                    disMap.put(vehiclePosition.getId(), vehiclePosition.getDistance());
                }
            }
        }else{
            for (XpOperationsUserPositionDTO vehiclePosition : vehiclePositions) {
                ids.add(vehiclePosition.getId());
                disMap.put(vehiclePosition.getId(), vehiclePosition.getDistance());
            }
        }
        query1.setIds(ids);
        query1.setOrderByField(1);
        PageInfo<XpOperationsUserWithRoleVO> ret = operationUserClient.listByQueryIds(query1).getData();

        // 设置距离，然后排序

        if (ret == null || ret.getRecords() == null || ret.getRecords().isEmpty()) {
            return R.ok();
        }
        if(CollUtil.isNotEmpty(ids)){
            R<List<XpFleetOperations>> findListByUserIdsR = xpFleetOperationsClient.findListByUserIds(ids);
            if(findListByUserIdsR.getCode() != R.SUCCESS || findListByUserIdsR.getData().isEmpty()){
                throw new ServiceException("未查询该车队");
            }
            // 将查询结果转换为 Map，key 为 userId，value 为 XpFleetOperations 对象
            Map<Long, XpFleetOperations> fleetOperationsMap = findListByUserIdsR.getData().stream()
                    .collect(Collectors.toMap(XpFleetOperations::getOperationsUserId, Function.identity()));
            
            for (XpOperationsUserWithRoleVO record : ret.getRecords()) {
                if(fleetOperationsMap.containsKey(record.getId())){
                    record.setFleetName(fleetOperationsMap.get(record.getId()).getFleetName());
                }
            }
        }
        ret.getRecords().forEach(e -> e.setDis(disMap.get(e.getId())));
        List<XpOperationsUserWithRoleVO> sorted = ret.getRecords().stream().sorted(Comparator.comparing(XpOperationsUserWithRoleVO::getDis)).collect(Collectors.toList());
        ret.setRecords(sorted);
//        List<XpOperationsUserWithRoleVO> sorted = ret.getRecords().stream().sorted(Comparator.comparing(XpOperationsUserWithRoleVO::getDis)).collect(Collectors.toList());
//        ret.setRecords(sorted);
        return R.ok(ret);
    }


 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java

@@ -1748,12 +1748,12 @@
            task.setTaskSource(2);
            saveTask.add(task);
        }
        this.saveBatch(saveTask);

        for (XpTask task : saveTask) {

            reassign(task.getId(),null);
        }
        this.saveBatch(saveTask);

    }

    @Override

 xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/handler/PositionMsgHandler.java

@@ -14,6 +14,8 @@
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Component;

import java.time.LocalDateTime;

@Component
@Slf4j
public class PositionMsgHandler implements BusinessMsgHandler{
@@ -47,12 +49,14 @@
            vehiclePosition.setLatitude(latitude);
            vehiclePosition.setLongitude(longitude);
            vehiclePosition.setLocation(location);
            vehiclePosition.setUpdateTime(System.currentTimeMillis());
            mongoTemplate.save(vehiclePosition);
        }else{
            Update update = new Update()
                    .set("id", Long.parseLong(uid))
                    .set("latitude", latitude)
                    .set("longitude", longitude);
                    .set("longitude", longitude)
                    .set("updateTime", System.currentTimeMillis());
            GeoJsonPoint location = new GeoJsonPoint(longitude, latitude);
            update.set("location", location);
            mongoTemplate.updateFirst(new Query(Criteria.where("id").is(Long.parseLong(uid))), update, XpOperationsUserPositionDTO.class);

 xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpFleetOperationsController.java

@@ -75,6 +75,20 @@


    /**
     * 根据人员id 获取所属车队
     *
     * @param userIds 运维人员id
     * @return
     */
    @PostMapping("/logan/inner/fleet-operations/findListByUserIds")
    public R<List<XpFleetOperations>> findListByUserIds(@RequestBody List<Long> userIds){

        List<XpFleetOperations> listByUserIds = xpFleetOperationsService.findListByUserIds(userIds);
        return R.ok(listByUserIds);
    }


    /**
     * 根据运维人员ID查询关联的车队ID列表（内部接口）
     *
     * @param userId 运维人员ID

 xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/mapper/XpFleetOperationsMapper.java

@@ -2,6 +2,9 @@

import com.xiaopeng.api.model.vehicleConvoy.XpFleetOperations;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +16,6 @@
 */
public interface XpFleetOperationsMapper extends BaseMapper<XpFleetOperations> {

    List<XpFleetOperations> findListByUserIds(@Param("userIds") List<Long> userIds);

}

 xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/IXpFleetOperationsService.java

@@ -3,6 +3,8 @@
import com.xiaopeng.api.model.vehicleConvoy.XpFleetOperations;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * <p>
 * 车队人员中间表 服务类
@@ -13,4 +15,5 @@
 */
public interface IXpFleetOperationsService extends IService<XpFleetOperations> {

    List<XpFleetOperations> findListByUserIds(List<Long> userIds);
}

 xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpFleetOperationsServiceImpl.java

@@ -6,6 +6,8 @@
import com.xiaopeng.vehicleConvoy.service.IXpFleetOperationsService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
 * 车队人员中间表 服务实现类
@@ -17,4 +19,10 @@
@Service
public class XpFleetOperationsServiceImpl extends ServiceImpl<XpFleetOperationsMapper, XpFleetOperations> implements IXpFleetOperationsService {


    @Override
    public List<XpFleetOperations> findListByUserIds(List<Long> userIds){
        return  baseMapper.findListByUserIds(userIds);
    }

}

 xp-robotaxi-vehicle-convoy-boot/src/main/resources/mapper/vehicleConvoy/XpFleetOperationsMapper.xml

@@ -2,4 +2,19 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xiaopeng.vehicleConvoy.mapper.XpFleetOperationsMapper">






    <select id="findListByUserIds" resultType="com.xiaopeng.api.model.vehicleConvoy.XpFleetOperations">
        SELECT a.*,b.fleet_name
        FROM xp_fleet_operations a
        INNER JOIN xp_fleet b on b.id = a.fleet_id
        where a.operations_user_id in
            <foreach collection="userIds" item="userId" open="(" separator="," close=")">
                #{userId}
            </foreach>

    </select>
</mapper>