Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi in...

puzhibing

2026-05-12 08cc6d5cf7e93b75cfabe7dcc2aeaa9afa1117eb

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

@@ -3,8 +3,10 @@

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.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.xiaopeng.api.dto.map.XpPointExportExcelQuery;
import com.xiaopeng.api.dto.operation.PointAddDto;
@@ -21,6 +23,9 @@
import com.xiaopeng.common.core.utils.WebUtils;
import com.xiaopeng.common.core.web.controller.BaseController;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.log.annotation.AdminOperationLog;
import com.xiaopeng.common.log.enums.AdminBusinessType;
import com.xiaopeng.common.log.enums.AdminOperationType;
import com.xiaopeng.map.constant.I18nKeyConstant;
import com.xiaopeng.map.exportExcel.XpPointExportExcel;
import com.xiaopeng.map.mangodb.service.XpGeoFencingPolygonService;
@@ -77,13 +82,13 @@
    public R<List<XpElectronicFenceArea>> listElectronicFenceArea(@RequestParam(required = false) String cityCode) {
        // 获取所有启用的电子围栏

        LambdaQueryChainWrapper<XpElectronicFence> eq = xpElectronicFenceService.lambdaQuery()
                .eq(XpElectronicFence::getStatus, 2);
        LambdaQueryWrapper<XpElectronicFence>  queryWrapper= new LambdaQueryWrapper<>();
        queryWrapper.eq(XpElectronicFence::getStatus, 2);
        if(StrUtil.isNotBlank(cityCode)){
            eq.eq(XpElectronicFence::getCityCode, cityCode);
            queryWrapper.eq(XpElectronicFence::getCityCode, cityCode);
        }

        List<XpElectronicFence> electronicFences = xpElectronicFenceService.list(eq);
        List<XpElectronicFence> electronicFences = xpElectronicFenceService.list(queryWrapper);
        List<Long> electronicFenceIds = electronicFences.stream().map(XpElectronicFence::getId).collect(Collectors.toList());
        if (electronicFenceIds.isEmpty()) {
            return R.ok(new ArrayList<XpElectronicFenceArea>());
@@ -116,6 +121,12 @@

    @ApiOperation(value = "点位导出")
    @PostMapping("/exportExcel")
    @AdminOperationLog(
            businessType = AdminBusinessType.POINT_MANAGEMENT,
            operationType = AdminOperationType.EXPORT,
            content = "导出正式点位",
            appendRequestData = true
    )
    public void exportExcel(@RequestBody XpPointExportExcelQuery query) {
        List<Long> pointIds = query == null ? Collections.emptyList() : query.getPointIds();
        List<Long> distinctIds = pointIds == null
@@ -163,10 +174,17 @@
    @PostMapping("/add")
    @ResponseBody
    @ApiOperation(value = "新增点位")
    @AdminOperationLog(
            businessType = AdminBusinessType.POINT_MANAGEMENT,
            operationType = AdminOperationType.ADD,
            content = "新增正式点位",
            appendRequestData = true
    )
    public R<?> add(@Validated @RequestBody PointAddDto pointAddDto) {
        if (xpGeoFencingPolygonService.isInFence(pointAddDto.getPointLon(), pointAddDto.getPointLat(), pointAddDto.getFenceId(), "prohibited_area")) {
            return R.ok("in_prohibited_area");
        }
        xpPointService.validateAdd(pointAddDto);
        return R.ok(xpPointService.addPointWithGeneratedNumber(pointAddDto));
    }

@@ -176,6 +194,12 @@
    @GetMapping("/deletePoint")
    @ResponseBody
    @ApiOperation(value = "删除点位")
    @AdminOperationLog(
            businessType = AdminBusinessType.POINT_MANAGEMENT,
            operationType = AdminOperationType.DELETE,
            contentExpression = "'删除正式点位,ids=' + #p0",
            appendRequestData = false
    )
    public R deletePoint(@RequestParam("ids") String ids) {
        List<Long> pointIds = Arrays.stream(ids.split(","))
                .map(String::trim)
@@ -202,6 +226,12 @@
     */
    @PostMapping("/edit")
    @ApiOperation(value = "编辑点位")
    @AdminOperationLog(
            businessType = AdminBusinessType.POINT_MANAGEMENT,
            operationType = AdminOperationType.EDIT,
            content = "编辑正式点位",
            appendRequestData = true
    )
    @Transactional
    @ShardingSphereTransactionType(TransactionType.BASE)
    public R edit(@Validated @RequestBody PointUpdateDto pointAddDto) {
@@ -209,6 +239,8 @@
        if (xpPoint == null) {
            throw new ServiceException("系统异常", I18nKeyConstant.SYSTEM_EXCEPTION);
        }
        xpPointService.validateUpdate(pointAddDto);
        pointAddDto.setStationSortNo(xpPoint.getStationSortNo());
        xpPointService.validatePointNameUnique(pointAddDto.getPointName(), pointAddDto.getId());
        BeanUtils.copyProperties(pointAddDto, xpPoint);
        if (Integer.valueOf(2).equals(pointAddDto.getOperationStatus()) && Integer.valueOf(5).equals(pointAddDto.getVerificationStatus())) {
@@ -235,12 +267,10 @@
        }
        xpPoint.setFpElectronicAreaId(null);

        Integer stationSortNo = xpPoint.getStationSortNo(); //点位在场站内排序
        Long stationId = pointAddDto.getStationId();
        Integer stationSortNo = pointAddDto.getStationSortNo(); //点位在场站内排序
        if(stationId != null && stationId > 0){
            if(stationSortNo == null){
                stationSortNo = 0;
            }
            stationSortNo = 0;
        }

        // 使用 lambdaUpdate 确保 pointPictures 为 null 时也能将数据库字段清空
@@ -271,6 +301,7 @@
                .set(XpPoint::getCityName, xpPoint.getCityName())
                .set(XpPoint::getDistrictName, xpPoint.getDistrictName())
                .set(XpPoint::getDistrictCode, xpPoint.getDistrictCode())
                .set(XpPoint::getPointOnOff, xpPoint.getPointOnOff())
                .set(XpPoint::getStationId, stationId)
                .set(XpPoint::getStationSortNo, stationSortNo)
                .update();
@@ -283,10 +314,16 @@
    /**
     * 点位详情
     */
    @GetMapping("/api/v1/point/queryById")
    @GetMapping("/queryById")
    @ApiOperation(value = "点位详情")
    public R<XpPoint> queryById(@RequestParam Long id) {
        return R.ok(xpPointService.getById(id));
        PointListQuery query = new PointListQuery();
        query.setId(id);
        List<XpPoint> pointList = xpPointService.findList(query);
        if(CollUtil.isNotEmpty(pointList)){
            return R.ok(pointList.get(0));
        }
        return R.ok(new XpPoint());
    }

    /**
@@ -294,6 +331,12 @@
     */
    @PostMapping("/enableDisable")
    @ApiOperation(value = "启用/禁用")
    @AdminOperationLog(
            businessType = AdminBusinessType.POINT_MANAGEMENT,
            operationType = AdminOperationType.SWITCH_STATUS,
            content = "启用/禁用正式点位",
            appendRequestData = true
    )
    public R enableDisable(@RequestBody XpPointEnableDisableDto dto) {
        XpPoint xpPoint = xpPointService.getById(dto.getId());
        xpPoint.setOperationStatus(dto.getOperationStatus());