1.修改bug 路线，用户路线偏好，改派、车型

yyy

2026-05-08 d2f2d372e03a81cdf2e44f02f1105cfb32dad88d

1.修改bug 路线，用户路线偏好，改派、车型

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/enums/RouteStrategyKind.java

@@ -95,6 +95,10 @@
        return Optional.ofNullable(AMAP_STRATEGY_INDEX.get(strategy));
    }

    public static RouteStrategyKind getStrategy(int strategy) {
        return AMAP_STRATEGY_INDEX.get(strategy);
    }

    public static List<RouteStrategyKind> orderedValues() {
        return ORDERED_VALUES;
    }

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpVehicleModel.java

@@ -25,7 +25,7 @@

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.NONE)
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    @ApiModelProperty(value = "名称")
    @NotBlank(message = "名称不能为空")

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/query/operation/XpPointSituationReportQuery.java

@@ -22,7 +22,7 @@
    @ApiModelProperty(value = "点位编号唯一")
    private String pointNumber;

    @ApiModelProperty(value = "点位状态值")
    @ApiModelProperty(value = "点位状态值 1待测试 2测试中 3测试不通过 4可运营 5待生效 6启用中 7已停用 8失效")
    private String pointStatusValue;

    /**

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

@@ -33,6 +33,8 @@
    @ApiModelProperty(value = "策略id")
    private Integer amapStrategy;

    @ApiModelProperty(value = "交通信号灯")
    private Integer trafficLights;


}

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

@@ -27,6 +27,8 @@

    @ApiModelProperty("主策略对应的高德 strategy，用于下单/队列")
    private Integer primaryRoutePlanRule;
    @ApiModelProperty(value = "导航策略名称")
    private String primaryRoutePlanName;

    @ApiModelProperty("路线几何与耗时距离")
    private RouteVo route;
@@ -40,6 +42,4 @@
    @ApiModelProperty("优惠券不可用时的提示（无可用券时）")
    private String couponMessage;

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

 xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/util/TaskUtil.java

@@ -19,7 +19,7 @@
    private MongoTemplate mongoTemplate;

    //删除过期的车辆定位数据
    @Scheduled(cron = "0/30 * * * * ?")
//    @Scheduled(cron = "0/30 * * * * ?")
    public void task() {
        log.info("执行删除无效的车辆定位数据");
        mongoTemplate.remove(Query.query(Criteria.where("addTime").isNull()), VehiclePosition.class);

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

@@ -1100,6 +1100,7 @@
        fareVo.setSystemDiscount(new BigDecimal(fareVo.getSystemDiscount() == null ? 0 : fareVo.getSystemDiscount()).setScale(2, RoundingMode.HALF_UP).doubleValue());
        routeAndFareVo.setFareEstimate(fareVo);
        routeAndFareVo.getXpPricingCard().setFinalFareStr(fareVo.getFinalFareStr());
//        routeAndFareVo.setTrafficLights();//交通信号灯 todo 20260508 红绿灯功能还没有
        fareVo.setId(null);
        return routeAndFareVo;
    }
@@ -1129,7 +1130,7 @@
            throw new ServiceException("当前区域未开通服务", I18nKeyConstant.NO_CURRENT_REGION);
        }

        StrategyPlanningConfig planningConfig = buildStrategyKindsForPlanning(userId, routeAndFareDto.getOpenCityId());
        StrategyPlanningConfig planningConfig = this.buildStrategyKindsForPlanning(userId, routeAndFareDto.getOpenCityId());
        List<RouteStrategyKind> kinds = planningConfig.getKinds();
        Map<String, RouteVo> routeById = new LinkedHashMap<>();
        Map<String, Set<RouteStrategyKind>> strategiesById = new LinkedHashMap<>();
@@ -1179,6 +1180,7 @@
            opt.setStrategyLabels(labels);
            opt.setPrimaryStrategyLabel(resolveStrategyDisplayName(primary, planningConfig.getDisplayNames()));
            opt.setPrimaryRoutePlanRule(primary.getAmapStrategy());
            opt.setPrimaryRoutePlanName(primary.getDisplayName());
            opt.setRoute(part.getRoute());
            opt.setFareEstimate(part.getFareEstimate());
            opt.setXpPricingCard(part.getXpPricingCard());
@@ -1186,9 +1188,17 @@
                opt.setCouponMessage("当前路线不满足优惠券使用条件");
            }
            opt.setOperateFree(operateFree);
            opt.setAmapStrategy(pricingDto.getRoutePlanRule());
            options.add(opt);
        }

        // 根据 pathFingerprint 去重，保留第一次出现的路线
//        options = new ArrayList<>(options.stream()
//                .collect(Collectors.toMap(
//                        RouteOptionVo::getPathFingerprint,
//                        option -> option,
//                        (existing, replacement) -> existing,
//                        LinkedHashMap::new
//                )).values());

        RouteStrategyKind userPref = resolveUserPreferredKind(userId).orElse(RouteStrategyKind.SMART);
        options.sort((a, b) -> compareRouteOptionByUserPreference(a, b, userPref, strategiesById));
@@ -1293,22 +1303,25 @@
    @Override
    public List<RoutePreferenceItemVo> listRoutePreferences(Long openCityId, String userId) {
        Set<String> enabledCodes = parseEnabledPreferenceCodes();
        Optional<RouteStrategyKind> savedPref = resolveUserPreferredKind(userId);
        Map<RouteStrategyKind, String> displayNames = buildStrategyKindsForPlanning(userId, openCityId).getDisplayNames();
        Optional<RouteStrategyKind> savedPref = resolveUserPreferredKind(userId);//获取用户设置的路线偏好
        List<XpRoutePlan> routePlans = findRoutePlans(openCityId);

        List<RoutePreferenceItemVo> list = new ArrayList<>();
        if(CollUtil.isNotEmpty(routePlans)){
        int i = 0;
        for (RouteStrategyKind k : RouteStrategyKind.orderedValues()) {
            if (!enabledCodes.contains(k.name())) {
                continue;
            }
            for (XpRoutePlan routePlan : routePlans) {
            RoutePreferenceItemVo v = new RoutePreferenceItemVo();
            v.setCode(k.name());
            v.setName(resolveStrategyDisplayName(k, displayNames));
                RouteStrategyKind strategy = RouteStrategyKind.getStrategy(routePlan.getRoutePlanRule());
                if(strategy != null){
                    v.setCode(strategy.name());
                }
                v.setName(routePlan.getPlanName());
            v.setEnabled(true);
            v.setSortOrder(i++);
            v.setAmapStrategy(k.getAmapStrategy());
            v.setSelected(savedPref.isPresent() && k == savedPref.get());
                v.setAmapStrategy(routePlan.getRoutePlanRule());
                v.setSelected(savedPref.isPresent() && strategy == savedPref.get());
            list.add(v);
            }
        }
        return list;
    }
@@ -1340,11 +1353,17 @@
        return set;
    }

    private List<XpRoutePlan> findRoutePlans (Long openCityId){
        return xpRoutePlanMapper.selectList(new LambdaQueryWrapper<XpRoutePlan>().eq(XpRoutePlan::getOpenCityId, openCityId)
                .eq(XpRoutePlan::getAuditStatus, 2));
    }

    /**
     * 用户偏好策略优先请求，其余策略仍请求以便合并去重。
     */
    private StrategyPlanningConfig buildStrategyKindsForPlanning(String userId, Long openCityId) {
        List<XpRoutePlan> xpRoutePlans = xpRoutePlanMapper.selectList(new LambdaQueryWrapper<XpRoutePlan>().eq(XpRoutePlan::getOpenCityId, openCityId));
        List<XpRoutePlan> xpRoutePlans = xpRoutePlanMapper.selectList(new LambdaQueryWrapper<XpRoutePlan>().eq(XpRoutePlan::getOpenCityId, openCityId)
                .eq(XpRoutePlan::getAuditStatus, 2));
        Map<RouteStrategyKind, String> displayNames = new LinkedHashMap<>();
        List<RouteStrategyKind> configuredKinds = new ArrayList<>();
        if (xpRoutePlans.isEmpty()) {

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

@@ -69,7 +69,7 @@
    public R<String> add(@RequestBody @Valid XpVehicleModel dto) {
        // 根据名称查询车辆型号，验证是否已存在
        List<XpVehicleModel> existingModel = xpVehicleModelService.queryByName(dto.getName());
        if (existingModel != null) {
        if (CollUtil.isNotEmpty(existingModel)) {
            return R.fail("车辆型号名称已存在");
        }
        boolean b = xpVehicleModelService.save(dto);
@@ -91,7 +91,7 @@
        }
        if(!model.getName().equals(dto.getName())){
            List<XpVehicleModel> existingModel = xpVehicleModelService.queryByName(dto.getName());
            if (existingModel != null) {
            if (CollUtil.isNotEmpty(existingModel)) {
                return R.fail("车辆型号名称已存在");
            }
        }
@@ -104,7 +104,7 @@

    @ApiOperation(value = "车型删除", tags = "管理后台-资产-车型管理")
    @DeleteMapping("/logan/inner/xpVehicleModel/deleteById")
    public R<String> deleteById(@RequestParam String id) {
    public R<String> deleteById(@RequestParam Long id) {
        /*
        1.判断车型是否被 车辆 xp_vehicle使用。
        2.判断车型是否被 定价管理 xp_pricing使用。
@@ -113,14 +113,14 @@
        if (vehicleCount > 0) {
            return R.fail("车辆型号已被车辆使用");
        }
        R<Long> priceCountByVmidR = xpPricingClient.getPriceCountByVmid(id);
        R<Long> priceCountByVmidR = xpPricingClient.getPriceCountByVmid(id+"");
        if (priceCountByVmidR.getCode() != R.SUCCESS || priceCountByVmidR.getData() == null) {
            return R.fail("根据车型获取定价策略失败");
        }
        if(priceCountByVmidR.getData()>0){
            return R.fail("车辆型号已被定价策略使用");
        }
        boolean b = xpVehicleModelService.logicalRemoveById(id);
        boolean b = xpVehicleModelService.removeById(id);
        if(b){
            return R.ok();
        }

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/mapper/XpVehicleModelMapper.java

@@ -27,6 +27,6 @@
     * @param id
     * @return
     */
    int getVehicleCount(String id);
    int getVehicleCount(Long id);

}

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

@@ -16,7 +16,7 @@

    List<XpVehicleModel> queryList();

    boolean logicalRemoveById(String id);
    boolean logicalRemoveById(Long id);

    int getVehicleCount(String id);
    int getVehicleCount(Long id);
}

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

@@ -312,6 +312,14 @@
        if(null != one){
            throw new ServiceException("巡游打卡规则名称已存在");
        }
        // 校验同一运维人员是否已存在有效规则（未删除且非循环模式或时间在有效期内）
        long count = this.count(new LambdaQueryWrapper<XpCruiseCheckInRule>()
                .eq(XpCruiseCheckInRule::getOperationsUserId, dto.getRelationId())
                .eq(XpCruiseCheckInRule::getDeleted, false));
        if (count > 0) {
            throw new ServiceException("该运维人员已存在有效的巡游打卡规则");
        }

        XpCruiseCheckInRule xpCruiseCheckInRule = new XpCruiseCheckInRule();
        BeanUtils.copyProperties(dto, xpCruiseCheckInRule);
        xpCruiseCheckInRule.setDeleted(false);

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

@@ -295,6 +295,9 @@
            List<Long> userIds = xpOperationsRoleResult.getData().stream().filter(x -> ids.contains(x.getOperationsUserId()))
                    .map(XpOperationsRole::getOperationsUserId)
                    .distinct().collect(Collectors.toList());
            if(CollUtil.isEmpty(userIds)){
                throw new ServiceException("未配置车队运维人员");
            }
            //获取首选人的实时定位，计算每个人到事故车辆位置的导航距离
            List<Operations> operationsList = new ArrayList<>();
            for (Long userId : userIds) {

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

@@ -29,7 +29,7 @@
    public List<XpVehicleModel> queryByName(String name) {
        return this.list(new LambdaQueryWrapper<XpVehicleModel>()
                .eq(XpVehicleModel::getDeleted, 0)
                .like(XpVehicleModel::getName, name));
                .eq(XpVehicleModel::getName, name));
    }

    /**
@@ -42,13 +42,13 @@
    }

    @Override
    public boolean logicalRemoveById(String id) {
//        XpVehicleModel entity = this.getById(id);
//        if (entity != null) {
//            entity.setDeleted(true);
//            return this.updateById(entity);
//        }
        return this.removeById(id);
    public boolean logicalRemoveById(Long id) {
        XpVehicleModel entity = this.getById(id);
        if (entity != null) {
            entity.setDeleted(true);
            return this.updateById(entity);
        }
        return true;
    }
    /**
     * 获取指定车型ID关联的车辆数量
@@ -57,7 +57,7 @@
     * @return 车辆数量
     */
    @Override
    public int getVehicleCount(String id){
    public int getVehicleCount(Long id){
        return this.baseMapper.getVehicleCount(id);
    }
    

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/exportExcle/XpPointSituationReportExportExcel.java

@@ -31,7 +31,7 @@
     * 现场情况说明
     */
    @ApiModelProperty("现场情况说明")
    @Excel(name = "现场情况说明",width = 20)
    @Excel(name = "异常情况说明",width = 20)
    private String sceneDescription;


@@ -40,7 +40,7 @@
    private String operationsUserName;

    @ApiModelProperty("上报时间")
    @Excel(name = "序号",width = 20)
    @Excel(name = "上报时间",width = 20)
    private String reportingTimeStr;

}

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

@@ -53,6 +53,9 @@
                query.setOperationsUserIds(ListUtil.toList(0L));
            }
        }
        if(query.getReportingTimeEnd() != null  ){
            query.setReportingTimeEnd(query.getReportingTimeEnd().plusDays(1));
        }
        // 创建分页对象
        PageInfo<XpPointSituationReportVo> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        // 调用Mapper查询

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

@@ -27,7 +27,39 @@
        <if test="query.pointNumber != null and query.pointNumber != ''">
            AND b.point_number LIKE CONCAT('%', #{query.pointNumber}, '%')
        </if>
        <if test="query.fieldSituation != null and query.fieldSituation != ''">
<!--        点位状态值 1待测试 2测试中 3测试不通过 4可运营 5待生效 6启用中 7已停用 8失效 -->
        <if test="query.pointStatusValue != null ">
          <choose>
              <!-- verification_status 验证状态 1=待验证、2=验证中、3=已验证 4验证失败 5待生效 -->
              <!-- operation_status 运营状态 1=待启用 2=启用中 3=已停用 4=已失效 -->
              <when test="query.pointStatusValue == 1">
                  AND b.verification_status = 1
              </when>
              <when test="query.pointStatusValue == 2">
                  AND b.verification_status = 2
              </when>
              <when test="query.pointStatusValue == 3">
                  AND b.verification_status = 4
              </when>
              <when test="query.pointStatusValue == 4">
                  AND b.verification_status = 3
              </when>
              <when test="query.pointStatusValue == 5">
                  AND b.verification_status = 5 and b.operation_status = 1
              </when>
              <when test="query.pointStatusValue == 6">
                  AND b.verification_status = 5 and b.operation_status = 2
              </when>
              <when test="query.pointStatusValue == 7">
                  AND b.verification_status = 5 and b.operation_status = 3
              </when>
              <when test="query.pointStatusValue == 8">
                  AND b.verification_status = 5 and b.operation_status = 4
              </when>
          </choose>
        </if>

        <if test="query.fieldSituation != null  or query.fieldSituation == 0">
            AND a.field_situation = #{query.fieldSituation}
        </if>
        <if test="query.operationsUserId != null and query.operationsUserId != ''">
@@ -43,7 +75,7 @@
            AND a.reporting_time &gt;= #{query.reportingTimeStart}
        </if>
        <if test="query.reportingTimeEnd != null">
            AND a.reporting_time &lt;= #{query.reportingTimeEnd}
            AND a.reporting_time &lt; #{query.reportingTimeEnd}
        </if>
        ORDER BY a.create_time DESC
    </select>

 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/test/OrderTest.java

@@ -59,6 +59,7 @@
        vehiclePosition.setMileageRange(300f);
        vehiclePosition.setHasOrder(0);
        vehiclePosition.setOrderId(param.getId());
        vehiclePosition.setAddTime(System.currentTimeMillis()+100000);
        mongoTemplate.save(vehiclePosition);