From 37dc1bb184fa6b15c6cc4cc0ea67bf4c4a815c0d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 三月 2026 19:07:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java
index 21b89c5..2c0b940 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java
@@ -4,10 +4,10 @@
import com.xiaopeng.api.dto.operation.PointAddDto;
import com.xiaopeng.api.dto.operation.PointUpdateDto;
import com.xiaopeng.api.dto.operation.XpPointEnableDisableDto;
-import com.xiaopeng.api.model.operation.XpCruisePlanPoint;
import com.xiaopeng.api.model.operation.XpElectronicFence;
import com.xiaopeng.api.model.operation.XpElectronicFenceArea;
import com.xiaopeng.api.model.operation.XpPoint;
+import com.xiaopeng.api.feignClient.operation.XpCruisePlanClient;
import com.xiaopeng.api.query.operation.PointListQuery;
import com.xiaopeng.api.query.operation.PointPageListListQuery;
import com.xiaopeng.map.constant.I18nKeyConstant;
@@ -18,14 +18,12 @@
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.api.dto.map.XpPointExportExcelQuery;
import com.xiaopeng.map.exportExcel.XpPointExportExcel;
-import com.xiaopeng.map.mapper.XpCruisePlanPointMapper;
import com.xiaopeng.map.mangodb.service.XpGeoFencingPolygonService;
import com.xiaopeng.map.service.XpElectronicFenceAreaService;
import com.xiaopeng.map.service.XpElectronicFenceService;
import com.xiaopeng.map.service.XpPointService;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -72,7 +70,7 @@
@Resource
private XpGeoFencingPolygonService xpGeoFencingPolygonService;
@Resource
- private XpCruisePlanPointMapper xpCruisePlanPointMapper;
+ private XpCruisePlanClient xpCruisePlanClient;
@ApiOperation(value = "获取所有运营中的区域", response = XpElectronicFenceArea.class)
@@ -183,10 +181,11 @@
if (pointIds.isEmpty()) {
return R.ok();
}
- Long relatedCount = xpCruisePlanPointMapper.selectCount(
- new LambdaQueryWrapper<XpCruisePlanPoint>().in(XpCruisePlanPoint::getPointId, pointIds)
- );
- if (relatedCount != null && relatedCount > 0) {
+ R<Boolean> existsResult = xpCruisePlanClient.existsCruisePlanPointByPointIds(pointIds);
+ if (existsResult == null || existsResult.getData() == null) {
+ throw new ServiceException("系统异常", I18nKeyConstant.SYSTEM_EXCEPTION);
+ }
+ if (Boolean.TRUE.equals(existsResult.getData())) {
throw new ServiceException("操作失败，该点位有关联的巡游点位", I18nKeyConstant.POINT_DELETE_HAS_CRUISE_PLAN_POINT);
}
xpPointService.removeBatchByIds(pointIds);
--
Gitblit v1.7.1