From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java | 134 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 124 insertions(+), 10 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java
index 3ca5d23..1207faa 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java
@@ -13,6 +13,9 @@
import com.xiaopeng.common.core.web.controller.BaseController;
import com.xiaopeng.api.query.operation.PointListQuery;
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.operation.dto.XpPointSpecialDto;
import com.xiaopeng.operation.service.IXpElectronicFenceAreaService;
import com.xiaopeng.operation.service.IXpElectronicFenceService;
@@ -30,6 +33,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -42,26 +46,136 @@
public class XpPointManagementController extends BaseController {
@Resource
- private XpPointService xpPointService;
+ private XpPointService xpPointService;
+ @Resource
+ private IXpElectronicFenceAreaService xpElectronicFenceAreaService;
+ @Resource
+ private IXpElectronicFenceService xpElectronicFenceService;
+
+
+ @ApiOperation(value = "获取所有运营中的区域", response = XpElectronicFenceArea.class)
+ @PostMapping("/listElectronicFenceArea")
+ public R<List<XpElectronicFenceArea>> listElectronicFenceArea() {
+ // 获取所有启用的电子围栏
+ List<XpElectronicFence> electronicFences = xpElectronicFenceService.lambdaQuery().eq(XpElectronicFence::getStatus, 2).list();
+ List<Long> electronicFenceIds = electronicFences.stream().map(XpElectronicFence::getId).collect(Collectors.toList());
+ if (electronicFenceIds.isEmpty()) {
+ return R.ok(new ArrayList<XpElectronicFenceArea>());
+ }
+ // 获取电子围栏下启用的运营区域
+ List<XpElectronicFenceArea> electronicFenceAreaList = xpElectronicFenceAreaService.lambdaQuery().in(XpElectronicFenceArea::getElectronicId, electronicFenceIds)
+ .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) {
+ 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) {
+ XpPoint xpPoint = new XpPoint();
+ BeanUtils.copyProperties(pointAddDto, xpPoint);
+ xpPoint.setFpElectronicAreaId(xpPoint.getElectronicAreaId());
+ xpPointService.save(xpPoint);
+ return R.ok();
+ }
+
+ /**
+ * 批量删除点位
+ */
+ @GetMapping("/deletePoint")
+ @ResponseBody
+ @ApiOperation(value = "删除点位")
+ public R deletePoint(@RequestParam("ids") String ids) {
+ 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) {
+ XpPoint xpPoint = new XpPoint();
+ BeanUtils.copyProperties(pointAddDto, xpPoint);
+ xpPoint.setFpElectronicAreaId(null);
+ xpPointService.updateById(xpPoint);
+ return R.ok();
+ }
+
+ /**
+ * 点位详情
+ */
+ @GetMapping("/queryPointById")
+ @ApiOperation(value = "点位详情")
+ public R<XpPoint> queryById(@RequestParam Long id) {
+ return R.ok(xpPointService.getById(id));
+ }
+
+ /**
+ * 启用/禁用
+ */
+ @PostMapping("/enableDisablePoint")
+ @ApiOperation(value = "启用/禁用")
+ public R enableDisable(@RequestBody XpPointEnableDisableDto dto) {
+ XpPoint xpPoint = xpPointService.getById(dto.getId());
+ xpPoint.setOperationStatus(dto.getOperationStatus());
+ xpPoint.setFpElectronicAreaId(null);
+ xpPointService.updateById(xpPoint);
+ return R.ok();
+ }
/**
* 设置特殊点位
*/
@PostMapping("/setSpecialPoint")
- @ApiOperation(value = "设置特殊点位",tags = "后台管理-特殊点位")
+ @ApiOperation(value = "设置特殊点位", tags = "后台管理-特殊点位")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.SPECIAL_POINT_MANAGEMENT,
+ operationType = AdminOperationType.EDIT,
+ content = "设置特殊点位",
+ appendRequestData = true
+ )
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.setElectronicAreaId(null);
+ 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.setElectronicAreaId(null);
+ e.setFpElectronicAreaId(null);
});
xpPointService.updateBatchById(list1);
return R.ok();
@@ -69,7 +183,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));
--
Gitblit v1.7.1