修改bug

puzhibing

2026-03-15 935bf1c8fc878d1927d366603d6afdbb53eaad18

修改bug

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

@@ -108,7 +108,7 @@
        List<XpPoint> list = xpPointService.lambdaQuery().in(XpPoint::getId, query.getPointIds()).list();
        return R.ok(list);
    }
    // "2029885249115987970" "2029883649798512642"

    @ApiOperation(value = "点位导出")
    @PostMapping("/exportExcel")
    public void exportExcel(@RequestBody XpPointExportExcelQuery query) {

 xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceServiceImpl.java

@@ -826,6 +826,15 @@
                }
            }
        }

        //如果区域状态从停用改为启用，需将区域内的点位全部启用
        if (status == 3 && dto.getStatus() == 2 && !xpPoints.isEmpty()){
            for (XpPoint xpPoint : xpPoints) {
                xpPoint.setOperationStatus(2);
                xpPoint.setFpElectronicAreaId(null);
                xpPointMapper.updateById(xpPoint);
            }
        }
        return R.ok();

    }

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

@@ -43,11 +43,11 @@
public class XpPointManagementController extends BaseController {

    @Resource
    private  XpPointService xpPointService;
    private XpPointService xpPointService;
    @Resource
    private  IXpElectronicFenceAreaService xpElectronicFenceAreaService;
    private IXpElectronicFenceAreaService xpElectronicFenceAreaService;
    @Resource
    private  IXpElectronicFenceService xpElectronicFenceService;
    private IXpElectronicFenceService xpElectronicFenceService;


    @ApiOperation(value = "获取所有运营中的区域", response = XpElectronicFenceArea.class)
@@ -56,7 +56,7 @@
        // 获取所有启用的电子围栏
        List<XpElectronicFence> electronicFences = xpElectronicFenceService.lambdaQuery().eq(XpElectronicFence::getStatus, 2).list();
        List<Long> electronicFenceIds = electronicFences.stream().map(XpElectronicFence::getId).collect(Collectors.toList());
        if (electronicFenceIds.isEmpty()){
        if (electronicFenceIds.isEmpty()) {
            return R.ok(new ArrayList<XpElectronicFenceArea>());
        }
        // 获取电子围栏下启用的运营区域
@@ -64,36 +64,41 @@
                .eq(XpElectronicFenceArea::getAreaStatus, 1).list();
        return R.ok(electronicFenceAreaList);
    }

    @ApiOperation(value = "点位管理列表", response = XpPoint.class)
    @PostMapping("/listPoint")
    public R<List<XpPoint>> list(@RequestBody PointListQuery query) {
        List<XpPoint> pageList = xpPointService.listAll(query);
        return R.ok(pageList);
    }

    @ApiOperation(value = "点位管理分页列表", response = XpPoint.class)
    @PostMapping("/pageList")
    public R<PageInfo<XpPoint>> pageList(@RequestBody PointPageListListQuery query) {
        PageInfo<XpPoint> pageList = xpPointService.pageList(query);
        return R.ok(pageList);
    }

    @PostMapping("/getByIds")
    public R<List<XpPoint>> getByIds(@RequestBody XpPointExportExcelQuery query){
    public R<List<XpPoint>> getByIds(@RequestBody XpPointExportExcelQuery query) {
        List<XpPoint> list = xpPointService.lambdaQuery().in(XpPoint::getId, query.getPointIds()).list();
        return R.ok(list);
    }

    /**
     * 新增点位
     */
    @PostMapping("/addPoint")
    @ResponseBody
    @ApiOperation(value = "新增点位")
    public R add(@Validated  @RequestBody PointAddDto pointAddDto) {
    public R add(@Validated @RequestBody PointAddDto pointAddDto) {
        XpPoint xpPoint = new XpPoint();
        BeanUtils.copyProperties(pointAddDto, xpPoint);
        xpPoint.setFpElectronicAreaId(xpPoint.getElectronicAreaId());
        xpPointService.save(xpPoint);
        return R.ok();
    }

    /**
     * 批量删除点位
     */
@@ -101,21 +106,24 @@
    @ResponseBody
    @ApiOperation(value = "删除点位")
    public R deletePoint(@RequestParam("ids") String ids) {
        xpPointService.removeBatchByIds(Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()));
        xpPointService.removeBatchByIds(Arrays.stream(ids.split(","))
                .map(Long::parseLong).collect(Collectors.toList()));
        return R.ok();
    }

    /**
     * 编辑点位
     */
    @PostMapping("/editPoint")
    @ApiOperation(value = "编辑点位")
    public R edit(@Validated@RequestBody PointUpdateDto pointAddDto) {
    public R edit(@Validated @RequestBody PointUpdateDto pointAddDto) {
        XpPoint xpPoint = new XpPoint();
        BeanUtils.copyProperties(pointAddDto, xpPoint);
        xpPoint.setFpElectronicAreaId(null);
        xpPointService.updateById(xpPoint);
        return R.ok();
    }

    /**
     * 点位详情
     */
@@ -124,6 +132,7 @@
    public R<XpPoint> queryById(@RequestParam Long id) {
        return R.ok(xpPointService.getById(id));
    }

    /**
     * 启用/禁用
     */
@@ -142,17 +151,20 @@
     * 设置特殊点位
     */
    @PostMapping("/setSpecialPoint")
    @ApiOperation(value = "设置特殊点位",tags = "后台管理-特殊点位")
    @ApiOperation(value = "设置特殊点位", tags = "后台管理-特殊点位")
    public R setSpecialPoint(@RequestBody XpPointSpecialDto dto) {
        xpPointService.update(new LambdaUpdateWrapper<XpPoint>().set(XpPoint::getChargePoint, 0).set(XpPoint::getParkingPoint,0));
        List<XpPoint> list = xpPointService.list(new LambdaQueryWrapper<XpPoint>().in(XpPoint::getId, dto.getChargePoints()));
        list.forEach(e->{
        xpPointService.update(new LambdaUpdateWrapper<XpPoint>().set(XpPoint::getChargePoint, 0)
                .set(XpPoint::getParkingPoint, 0));
        List<XpPoint> list = xpPointService.list(new LambdaQueryWrapper<XpPoint>()
                .in(XpPoint::getId, dto.getChargePoints()));
        list.forEach(e -> {
            e.setChargePoint(1);
            e.setFpElectronicAreaId(null);
        });
        xpPointService.updateBatchById(list);
        List<XpPoint> list1 = xpPointService.list(new LambdaQueryWrapper<XpPoint>().in(XpPoint::getId, dto.getParkingPoints()));
        list1.forEach(e->{
        List<XpPoint> list1 = xpPointService.list(new LambdaQueryWrapper<XpPoint>()
                .in(XpPoint::getId, dto.getParkingPoints()));
        list1.forEach(e -> {
            e.setParkingPoint(1);
            e.setFpElectronicAreaId(null);
        });
@@ -162,7 +174,7 @@


    @GetMapping("/listSpecialPoint")
    @ApiOperation(value = "获取特殊点位",tags = "后台管理-特殊点位")
    @ApiOperation(value = "获取特殊点位", tags = "后台管理-特殊点位")
    public R<SpecialPointVo> getSpecialPoint() {
        List<XpPoint> chargePoints = xpPointService.list(new LambdaQueryWrapper<XpPoint>().eq(XpPoint::getChargePoint, 1));
        List<XpPoint> parkingPoints = xpPointService.list(new LambdaQueryWrapper<XpPoint>().eq(XpPoint::getParkingPoint, 1));