From c8a9b0aa391237339da07db6f9751d0192776457 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 07 三月 2026 21:14:20 +0800
Subject: [PATCH] bug修改
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 3 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 cbe4e4c..f933b07 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
@@ -1,6 +1,7 @@
package com.xiaopeng.operation.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.xiaopeng.api.dto.map.XpPointExportExcelQuery;
import com.xiaopeng.api.dto.operation.PointAddDto;
@@ -16,15 +17,20 @@
import com.xiaopeng.operation.service.IXpElectronicFenceAreaService;
import com.xiaopeng.operation.service.IXpElectronicFenceService;
import com.xiaopeng.operation.service.XpPointService;
+import com.xiaopeng.operation.vo.SpecialPointListVo;
+import com.xiaopeng.operation.vo.SpecialPointVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
+import org.apache.shardingsphere.transaction.core.TransactionType;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
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;
@@ -82,6 +88,8 @@
@PostMapping("/addPoint")
@ResponseBody
@ApiOperation(value = "新增点位")
+// @Transactional
+// @ShardingSphereTransactionType(TransactionType.BASE)
public R add(@Validated @RequestBody PointAddDto pointAddDto) {
XpPoint xpPoint = new XpPoint();
BeanUtils.copyProperties(pointAddDto, xpPoint);
@@ -94,6 +102,8 @@
@GetMapping("/deletePoint")
@ResponseBody
@ApiOperation(value = "删除点位")
+// @Transactional
+// @ShardingSphereTransactionType(TransactionType.BASE)
public R deletePoint(@RequestParam("ids") String ids) {
xpPointService.removeBatchByIds(Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()));
return R.ok();
@@ -103,6 +113,8 @@
*/
@PostMapping("/editPoint")
@ApiOperation(value = "编辑点位")
+// @Transactional
+// @ShardingSphereTransactionType(TransactionType.BASE)
public R edit(@Validated@RequestBody PointUpdateDto pointAddDto) {
XpPoint xpPoint = new XpPoint();
BeanUtils.copyProperties(pointAddDto, xpPoint);
@@ -122,9 +134,12 @@
*/
@PostMapping("/enableDisablePoint")
@ApiOperation(value = "启用/禁用")
+// @Transactional
+// @ShardingSphereTransactionType(TransactionType.BASE)
public R enableDisable(@RequestBody XpPointEnableDisableDto dto) {
XpPoint xpPoint = xpPointService.getById(dto.getId());
xpPoint.setOperationStatus(dto.getOperationStatus());
+ xpPoint.setElectronicAreaId(null);
xpPointService.updateById(xpPoint);
return R.ok();
}
@@ -134,11 +149,53 @@
* 设置特殊点位
*/
@PostMapping("/setSpecialPoint")
- @ApiOperation(value = "设置特殊点位")
+ @ApiOperation(value = "设置特殊点位",tags = "后台管理-特殊点位")
public R setSpecialPoint(@RequestBody XpPointSpecialDto dto) {
xpPointService.update(new LambdaUpdateWrapper<XpPoint>().set(XpPoint::getChargePoint, 0).set(XpPoint::getParkingPoint,0));
- xpPointService.update(new LambdaUpdateWrapper<XpPoint>().in(XpPoint::getId,dto.getChargePoints()).set(XpPoint::getChargePoint,1));
- xpPointService.update(new LambdaUpdateWrapper<XpPoint>().in(XpPoint::getId,dto.getParkingPoints()).set(XpPoint::getParkingPoint,2));
+ List<XpPoint> list = xpPointService.list(new LambdaQueryWrapper<XpPoint>().in(XpPoint::getId, dto.getChargePoints()));
+ list.forEach(e->{
+ e.setChargePoint(1);
+ e.setElectronicAreaId(null);
+ });
+ xpPointService.updateBatchById(list);
+ List<XpPoint> list1 = xpPointService.list(new LambdaQueryWrapper<XpPoint>().in(XpPoint::getId, dto.getParkingPoints()));
+ list1.forEach(e->{
+ e.setParkingPoint(1);
+ e.setElectronicAreaId(null);
+ });
+ xpPointService.updateBatchById(list1);
return R.ok();
}
+
+
+ @GetMapping("/listSpecialPoint")
+ @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));
+
+ SpecialPointVo specialPointVo = new SpecialPointVo();
+ ArrayList<SpecialPointListVo> chargePointsList = new ArrayList<>();
+ for (XpPoint chargePoint : chargePoints) {
+ SpecialPointListVo specialPointListVo = new SpecialPointListVo();
+ specialPointListVo.setPointName(chargePoint.getPointName());
+ specialPointListVo.setPointAddress(chargePoint.getPointAddress());
+ specialPointListVo.setPointId(chargePoint.getId());
+ chargePointsList.add(specialPointListVo);
+ }
+ specialPointVo.setChargePoints(chargePointsList);
+
+
+ ArrayList<SpecialPointListVo> parkingPointsList = new ArrayList<>();
+ for (XpPoint parkingPoint : parkingPoints) {
+ SpecialPointListVo specialPointListVo = new SpecialPointListVo();
+ specialPointListVo.setPointName(parkingPoint.getPointName());
+ specialPointListVo.setPointAddress(parkingPoint.getPointAddress());
+ specialPointListVo.setPointId(parkingPoint.getId());
+ parkingPointsList.add(specialPointListVo);
+ }
+ specialPointVo.setParkingPoints(parkingPointsList);
+
+ return R.ok(specialPointVo);
+ }
}
--
Gitblit v1.7.1