Merge remote-tracking branch 'origin/1.0' into 1.0

puzhibing

2026-04-16 46342ddcf5d52ccbf2ae8d8a9a0b14cc0d29b250

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

@@ -1,5 +1,6 @@
package com.xiaopeng.api.factory.operation;

import com.xiaopeng.api.dto.map.XpPointExportExcelQuery;
import com.xiaopeng.api.dto.operation.PointAddDto;
import com.xiaopeng.api.dto.operation.PointMapQuery;
import com.xiaopeng.api.dto.operation.PointUpdateDto;
@@ -9,10 +10,13 @@
import com.xiaopeng.api.feignClient.operation.XpPointClient;
import com.xiaopeng.api.model.operation.XpElectronicFenceArea;
import com.xiaopeng.api.model.operation.XpPoint;
import com.xiaopeng.api.query.operation.PointPageListQuery;
import com.xiaopeng.api.query.operation.PointListQuery;
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.web.page.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
@@ -20,6 +24,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;

@Slf4j
@Component
@@ -46,9 +51,21 @@
            }

            @Override
            public R<List<XpPoint>> list(PointPageListQuery query) {
                log.error("获取点位分页列表失败:{}", cause.getMessage());
            public R<List<XpPoint>> list(PointListQuery query) {
                log.error("获取点位列表失败:{}", cause.getMessage());
                return R.fail(Collections.emptyList());
            }

            @Override
            public R<PageInfo<XpPoint>> pageList(PointPageListListQuery query) {
                log.error("获取点位分页列表失败:{}", cause.getMessage());
                return R.fail(new PageInfo<>());
            }

            @Override
            public R<List<XpPoint>> getByIds(XpPointExportExcelQuery query) {
                log.error("根据点位ids获取点位列表失败:{}", cause.getMessage());
                return R.fail(new ArrayList<>());
            }

            @Override
@@ -70,6 +87,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("修改点位运营状态失败");
@@ -80,6 +103,18 @@
                log.error("获取地图点位失败:{}", cause.getMessage());
                return R.ok(new ArrayList<>());
            }

            @Override
            public R<List<XpPoint>> getPointsInfo(Set<Long> points) {
                log.error("获取点位信息失败:{}", cause.getMessage());
                return null;
            }

            @Override
            public R<Boolean> nowInTimePoint(Long pointId) {
                log.error("判断点位是在有效期内失败:{}", cause.getMessage());
                return R.fail("判断点位是在有效期内失败");
            }
        };
    }
}