Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

liujie

2026-02-24 d371f1f42380ef5a8c8c2e0e02c0514074776f6d

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/operation/XpPointClientFallbackFactory.java

@@ -70,6 +70,12 @@
            }

            @Override
            public R deletePoint(String ids) {
                log.error("删除点位失败:{}", cause.getMessage());
                return R.fail("删除点位失败");
            }

            @Override
            public R enableDisable(XpPointEnableDisableDto dto) {
                log.error("修改点位运营状态失败:{}", cause.getMessage());
                return R.fail("修改点位运营状态失败");

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpPointClient.java

@@ -53,6 +53,11 @@
     */
    @GetMapping("/api/v1/point/queryPointById")
    public R<XpPoint> queryById(@RequestParam Long id);
    /**
     * 点位删除
     */
    @GetMapping("/api/v1/point/deletePoint/{ids}")
    R deletePoint(@PathVariable("ids") String ids);

    /**
     * 启用/禁用

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

New file
@@ -0,0 +1,19 @@
package com.xiaopeng.api.vo.operation;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

import java.math.BigDecimal;

@lombok.Data
@ApiModel(description = "计价规则时段Vo")
public class PricingDetailVo {


    @ApiModelProperty(value = "时段 1普通 2夜间行驶 3高峰期 4节假日")
    private Integer type;

    @ApiModelProperty(value = "金额")
    private BigDecimal amount;

}

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

New file
@@ -0,0 +1,26 @@
package com.xiaopeng.api.vo.operation;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

import java.util.List;

@lombok.Data
@ApiModel(description = "计价规则Vo")
public class PricingVo {
    @ApiModelProperty(value = "起步价")
    private Double startAmount;
    @ApiModelProperty(value = "起步价公里")
    private Double startMileage;
    @ApiModelProperty(value = "起步价分钟")
    private Double startMinute;
    @ApiModelProperty(value = "起步价时段")
    private List<PricingDetailVo> startTimes;
    @ApiModelProperty(value = "里程费时段")
    private List<PricingDetailVo> mileageTimes;
    @ApiModelProperty(value = "时长费")
    private List<PricingDetailVo> durationTimes;
    @ApiModelProperty(value = "远途费")
    private List<PricingDetailVo> longDistanceTimes;

}

 xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java

@@ -72,6 +72,16 @@
        return xpPointClient.edit(pointAddDto);
    }
    /**
     * 批量删除点位
     */
    @GetMapping("/deletePoint/{ids}")
    @ResponseBody
    @ApiOperation(value = "删除点位")
    public R deletePoint(@PathVariable("ids") String ids) {
        xpPointClient.deletePoint(ids);
        return R.ok();
    }
    /**
     * 编辑点位
     */
    @GetMapping("/queryById")

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

@@ -20,6 +20,7 @@

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

@@ -70,6 +71,16 @@
        return R.ok();
    }
    /**
     * 批量删除点位
     */
    @GetMapping("/deletePoint/{ids}")
    @ResponseBody
    @ApiOperation(value = "删除点位")
    public R deletePoint(@PathVariable("ids") String ids) {
        xpPointService.removeBatchByIds(Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()));
        return R.ok();
    }
    /**
     * 编辑点位
     */
    @PostMapping("/editPoint")