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

puzhibing

2026-05-11 b2ff9dd285dcc9ec6b91e69bb9222515c1208d12

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

@@ -3,6 +3,11 @@

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;
import com.xiaopeng.api.dto.operation.PointUpdateDto;
@@ -25,6 +30,7 @@
import com.xiaopeng.map.service.XpElectronicFenceService;
import com.xiaopeng.map.service.XpPointService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
@@ -70,10 +76,16 @@

    @ApiOperation(value = "获取所有运营中的区域", response = XpElectronicFenceArea.class)
    @PostMapping("/listElectronicFenceArea")
    public R<List<XpElectronicFenceArea>> listElectronicFenceArea() {
    public R<List<XpElectronicFenceArea>> listElectronicFenceArea(@RequestParam(required = false) String cityCode) {
        // 获取所有启用的电子围栏
        List<XpElectronicFence> electronicFences = xpElectronicFenceService.lambdaQuery()
                .eq(XpElectronicFence::getStatus, 2).list();

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

        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>());
@@ -157,6 +169,7 @@
        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));
    }

@@ -199,6 +212,9 @@
        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())) {
            Long electronicAreaId = xpPoint.getElectronicAreaId();
@@ -223,6 +239,13 @@
            }
        }
        xpPoint.setFpElectronicAreaId(null);

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

        // 使用 lambdaUpdate 确保 pointPictures 为 null 时也能将数据库字段清空
        // （updateById 默认策略 NOT_NULL 会跳过 null 值，导致删除图片后数据库仍保留旧图片）
        xpPointService.lambdaUpdate()
@@ -251,17 +274,29 @@
                .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();

        //场站点位排序 后添加的点位 排第一个。
        xpPointService.setStationSortNo(xpPoint.getStationId(),stationSortNo);
        return R.ok();
    }

    /**
     * 点位详情
     */
    @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());
    }

    /**