From 847aa93dec5915b30aab7609561c050f2bfcc8ec Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 23 四月 2026 10:30:59 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpTestPointManagementController.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpTestPointManagementController.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpTestPointManagementController.java
index cdbf546..32d8604 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpTestPointManagementController.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpTestPointManagementController.java
@@ -8,8 +8,9 @@
import com.xiaopeng.api.dto.operation.PointUpdateDto;
import com.xiaopeng.api.dto.operation.XpPointEnableDisableDto;
import com.xiaopeng.api.model.map.XpTestPoint;
-import com.xiaopeng.api.model.operation.XpElectronicFence;
-import com.xiaopeng.api.model.operation.XpElectronicFenceArea;
+import com.xiaopeng.api.model.operation.XpTestElectronicFence;
+import com.xiaopeng.api.model.operation.XpTestElectronicFenceArea;
+import com.xiaopeng.api.model.operation.XpTestElectronicFenceArea;
import com.xiaopeng.api.query.operation.PointListQuery;
import com.xiaopeng.api.query.operation.PointPageListListQuery;
import com.xiaopeng.api.vo.map.QueryTestPoint;
@@ -17,9 +18,7 @@
import com.xiaopeng.common.core.web.controller.BaseController;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.map.dto.XpPointSpecialDto;
-import com.xiaopeng.map.service.XpElectronicFenceAreaService;
-import com.xiaopeng.map.service.XpElectronicFenceService;
-import com.xiaopeng.map.service.XpTestPointService;
+import com.xiaopeng.map.service.*;
import com.xiaopeng.map.vo.SpecialPointListVo;
import com.xiaopeng.map.vo.SpecialPointVo;
import io.swagger.annotations.Api;
@@ -44,23 +43,23 @@
@Resource
private XpTestPointService xpTestPointService;
@Resource
- private XpElectronicFenceAreaService xpElectronicFenceAreaService;
+ private XpTestElectronicFenceAreaService xpElectronicFenceAreaService;
@Resource
- private XpElectronicFenceService xpElectronicFenceService;
+ private XpTestElectronicFenceService xpElectronicFenceService;
- @ApiOperation(value = "获取所有运营中的区域", response = XpElectronicFenceArea.class)
+ @ApiOperation(value = "获取所有运营中的区域", response = XpTestElectronicFenceArea.class)
@PostMapping("/api/v1/testPoint/listElectronicFenceArea")
- public R<List<XpElectronicFenceArea>> listElectronicFenceArea() {
+ public R<List<XpTestElectronicFenceArea>> listElectronicFenceArea() {
// 获取所有启用的电子围栏
- List<XpElectronicFence> electronicFences = xpElectronicFenceService.lambdaQuery().eq(XpElectronicFence::getStatus, 2).list();
- List<Long> electronicFenceIds = electronicFences.stream().map(XpElectronicFence::getId).collect(Collectors.toList());
+ List<XpTestElectronicFence> electronicFences = xpElectronicFenceService.lambdaQuery().eq(XpTestElectronicFence::getStatus, 2).list();
+ List<Long> electronicFenceIds = electronicFences.stream().map(XpTestElectronicFence::getId).collect(Collectors.toList());
if (electronicFenceIds.isEmpty()) {
- return R.ok(new ArrayList<XpElectronicFenceArea>());
+ return R.ok(new ArrayList<XpTestElectronicFenceArea>());
}
// 获取电子围栏下启用的运营区域
- List<XpElectronicFenceArea> electronicFenceAreaList = xpElectronicFenceAreaService.lambdaQuery().in(XpElectronicFenceArea::getElectronicId, electronicFenceIds)
- .eq(XpElectronicFenceArea::getAreaStatus, 1).list();
+ List<XpTestElectronicFenceArea> electronicFenceAreaList = xpElectronicFenceAreaService.lambdaQuery().in(XpTestElectronicFenceArea::getTestElectronicId, electronicFenceIds)
+ .eq(XpTestElectronicFenceArea::getAreaStatus, 1).list();
return R.ok(electronicFenceAreaList);
}
--
Gitblit v1.7.1