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

@@ -23,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;
@@ -118,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
@@ -165,6 +174,12 @@
    @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");
@@ -179,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)
@@ -205,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) {
@@ -304,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());