合并代码

puzhibing

2026-03-06 bf44552798a9ca7fe77bf2a11f33f6babaabc276

合并代码

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

@@ -14,13 +14,15 @@
import com.xiaopeng.api.query.operation.PointPageListListQuery;
import com.xiaopeng.api.vo.order.XpHistoryEndPointsVo;
import com.xiaopeng.api.vo.order.XpHistoryStartPointsVo;
import com.xiaopeng.api.vo.order.XpPointInfoVo;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.dto.ServiceNameConstantsEnum;
import com.xiaopeng.common.core.web.page.PageInfo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;
import java.util.Set;
@@ -34,12 +36,17 @@

    @PostMapping("/base/v1/mini-program/xp-point/getHistoryEndPoints")
    R<List<XpHistoryEndPointsVo>> getHistoryEndPoints(@RequestBody HistoryEndPointsDto historyEndPointsDto);


    @PostMapping("/api/v1/point/listElectronicFenceArea")
    R<List<XpElectronicFenceArea>> listElectronicFenceArea();

    @PostMapping("/api/v1/point/listPoint")
    R<List<XpPoint>> list(@RequestBody PointListQuery query);

    @PostMapping("/api/v1/point/pageList")
    R<PageInfo<XpPoint>> pageList(@RequestBody PointPageListListQuery query);

    @PostMapping("/api/v1/point/getByIds")
    R<List<XpPoint>> getByIds(@RequestBody XpPointExportExcelQuery query);

@@ -53,13 +60,14 @@
     * 编辑点位
     */
    @PostMapping("/api/v1/point/editPoint")
    R edit(@Validated@RequestBody PointUpdateDto pointAddDto);
    R edit(@Validated @RequestBody PointUpdateDto pointAddDto);

    /**
     * 点位详情
     */
    @GetMapping("/api/v1/point/queryPointById")
    public R<XpPoint> queryById(@RequestParam Long id);

    /**
     * 点位删除
     */
@@ -78,8 +86,10 @@

    @PostMapping("/base/v1/mini-program/inner/point/getPointsInfo")
    R<List<XpPoint>> getPointsInfo(@RequestBody Set<Long> points);

    /**
     * 判断点位是在有效期内
     *
     * @param pointId
     * @return
     */

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/task/TaskUtil.java

@@ -49,6 +49,7 @@
                        .in(XpPoint::getElectronicAreaId, areaIds)
                        .list();
                for (XpPoint xpPoint : xpPoints) {
                    xpPoint.setElectronicAreaId(null);
                    xpPoint.setOperationStatus(4);
                }
                xpPointService.updateBatchById(xpPoints);
@@ -68,6 +69,7 @@
                        .in(XpPoint::getElectronicAreaId, areaIds)
                        .list();
                for (XpPoint xpPoint : xpPoints) {
                    xpPoint.setElectronicAreaId(null);
                    xpPoint.setOperationStatus(4);
                }
                xpPointService.updateBatchById(xpPoints);