java/Robotaxi.git

parent: 1ca988b9 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

liujie

2026-02-26 523f7ddf88485eb611f8f8130e35e2bd88d5b386

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

6个文件已修改

	xp-robotaxi-map-boot/pom.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpElectronicFenceController.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/job/base/TimeJobType.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 xp-robotaxi-map-boot/pom.xml

@@ -15,6 +15,7 @@
    </description>

    <dependencies>

        <!-- easypoi -->
        <!-- Apache POI 核心依赖 -->
        <dependency>

 xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java

@@ -18,6 +18,8 @@
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.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -58,6 +60,7 @@
    @PostMapping("/add")
    @ApiOperation(value = "新增电子围栏")
    @Transactional
    @ShardingSphereTransactionType(TransactionType.BASE)
    public R add(@Validated @RequestBody ElectronicFenceAddDto dto) {

        return xpElectronicClient.add(dto);
@@ -71,6 +74,8 @@
    @PostMapping("/updateStatus")
    @ResponseBody
    @ApiOperation(value = "修改状态")
    @Transactional
    @ShardingSphereTransactionType(TransactionType.BASE)
    public R updateStatus(@RequestBody ElectronicFenceAreaUpdateStatusDto dto) {

        return xpElectronicClient.updateStatus(dto);
@@ -93,7 +98,7 @@
    @ResponseBody
    @ApiOperation(value = "编辑电子围栏")
    @Transactional
    public R edit(@Validated @RequestBody ElectronicFenceUpdateDto dto) {
    @ShardingSphereTransactionType(TransactionType.BASE)    public R edit(@Validated @RequestBody ElectronicFenceUpdateDto dto) {
        return xpElectronicClient.edit(dto);
    }

@@ -102,6 +107,8 @@
     */
    @PostMapping("/copy")
    @ApiOperation(value = "复制电子围栏")
    @Transactional
    @ShardingSphereTransactionType(TransactionType.BASE)
    public R<Long> copy(@RequestParam("id") Integer id) {
        return xpElectronicClient.copy(id);
    }

 xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java

@@ -23,6 +23,9 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -113,22 +116,25 @@
    /**
     * 新增点位
     */
    @GlobalTransactional(name = "add-point", rollbackFor = Exception.class)

    @PostMapping("/add")
    @ApiOperation(value = "新增点位")
    @Transactional
    @ShardingSphereTransactionType(TransactionType.BASE)
    public R add(@Validated  @RequestBody PointAddDto pointAddDto) {
        xpPointClient.add(pointAddDto);
        int temp =1/0;
        return R.ok();
    }
    /**
     * 编辑点位
     */
    @PostMapping("/edit")
    @Transactional
    @ShardingSphereTransactionType(TransactionType.BASE)
    @ApiOperation(value = "编辑点位")
    public R edit(@Validated@RequestBody PointUpdateDto pointAddDto) {

        return xpPointClient.edit(pointAddDto);
        xpPointClient.edit(pointAddDto);
        return R.ok();
    }
    /**
     * 批量删除点位
@@ -136,6 +142,8 @@
    @GetMapping("/deletePoint")
    @ResponseBody
    @ApiOperation(value = "删除点位")
    @Transactional
    @ShardingSphereTransactionType(TransactionType.BASE)
    public R deletePoint(@RequestParam("ids") String ids) {
        xpPointClient.deletePoint(ids);
        return R.ok();
@@ -155,6 +163,8 @@
    @PostMapping("/enableDisable")
    @ResponseBody
    @ApiOperation(value = "启用/禁用")
    @Transactional
    @ShardingSphereTransactionType(TransactionType.BASE)
    public R enableDisable(@RequestBody XpPointEnableDisableDto dto) {
        return xpPointClient.enableDisable(dto);
    }

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpElectronicFenceController.java

@@ -20,6 +20,8 @@
import com.xiaopeng.operation.service.XpRegionService;
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.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -83,6 +85,7 @@
    @PostMapping("/add")
    @ApiOperation(value = "新增电子围栏")
    @Transactional
    @ShardingSphereTransactionType(TransactionType.BASE)
    public R add(@Validated @RequestBody ElectronicFenceAddDto dto) {
        return xpElectronicFenceService.addElectronic(dto);
    }
@@ -95,6 +98,8 @@
    @PostMapping("/updateStatus")
    @ResponseBody
    @ApiOperation(value = "修改状态")
    @Transactional
    @ShardingSphereTransactionType(TransactionType.BASE)
    public R updateStatus(@RequestBody ElectronicFenceAreaUpdateStatusDto dto) {
        XpElectronicFenceArea electronicFenceArea = xpElectronicFenceAreaService.getById(dto.getId());
        if (electronicFenceArea == null) {
@@ -134,6 +139,7 @@
    @PostMapping("/edit")
    @ApiOperation(value = "编辑电子围栏")
    @Transactional
    @ShardingSphereTransactionType(TransactionType.BASE)
    public R edit(@Validated @RequestBody ElectronicFenceUpdateDto dto) {
        return xpElectronicFenceService.editElectronic(dto);
    }
@@ -144,6 +150,7 @@
    @PostMapping("/copy")
    @ApiOperation(value = "复制电子围栏")
    @Transactional
    @ShardingSphereTransactionType(TransactionType.BASE)
    public R<Long> copy(@RequestParam("id") Integer id) {
        XpElectronicFence electronicFence = xpElectronicFenceService.getById(id);
        if (electronicFence.getStatus()==2){

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java

@@ -19,6 +19,8 @@
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;
@@ -78,9 +80,10 @@
    /**
     * 新增点位
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("/addPoint")
    @ResponseBody
    @Transactional
    @ShardingSphereTransactionType(TransactionType.BASE)
    @ApiOperation(value = "新增点位")
    public R add(@Validated  @RequestBody PointAddDto pointAddDto) {
        XpPoint xpPoint = new XpPoint();
@@ -94,6 +97,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 +108,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,6 +129,8 @@
     */
    @PostMapping("/enableDisablePoint")
    @ApiOperation(value = "启用/禁用")
    @Transactional
    @ShardingSphereTransactionType(TransactionType.BASE)
    public R enableDisable(@RequestBody XpPointEnableDisableDto dto) {
        XpPoint xpPoint = xpPointService.getById(dto.getId());
        xpPoint.setOperationStatus(dto.getOperationStatus());

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/job/base/TimeJobType.java

@@ -7,6 +7,8 @@
public enum TimeJobType {
    ELECTRONIC_EFFECT("electronic_effect","电子围栏生效"),
    ELECTRONIC_FAILURE("electronic_failure","电子围栏失效");


    private String type;
    private String desc;
    private TimeJobType(String type, String desc) {

			@@ -15,6 +15,7 @@
			</description>

			<dependencies>

			<!-- easypoi -->
			<!-- Apache POI 核心依赖 -->
			<dependency>

			@@ -18,6 +18,8 @@
			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.transaction.annotation.Transactional;
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;
			@@ -58,6 +60,7 @@
			@PostMapping("/add")
			@ApiOperation(value = "新增电子围栏")
			@Transactional
			@ShardingSphereTransactionType(TransactionType.BASE)
			public R add(@Validated @RequestBody ElectronicFenceAddDto dto) {

			return xpElectronicClient.add(dto);
			@@ -71,6 +74,8 @@
			@PostMapping("/updateStatus")
			@ResponseBody
			@ApiOperation(value = "修改状态")
			@Transactional
			@ShardingSphereTransactionType(TransactionType.BASE)
			public R updateStatus(@RequestBody ElectronicFenceAreaUpdateStatusDto dto) {

			return xpElectronicClient.updateStatus(dto);
			@@ -93,7 +98,7 @@
			@ResponseBody
			@ApiOperation(value = "编辑电子围栏")
			@Transactional
			public R edit(@Validated @RequestBody ElectronicFenceUpdateDto dto) {
			@ShardingSphereTransactionType(TransactionType.BASE) public R edit(@Validated @RequestBody ElectronicFenceUpdateDto dto) {
			return xpElectronicClient.edit(dto);
			}

			@@ -102,6 +107,8 @@
			*/
			@PostMapping("/copy")
			@ApiOperation(value = "复制电子围栏")
			@Transactional
			@ShardingSphereTransactionType(TransactionType.BASE)
			public R<Long> copy(@RequestParam("id") Integer id) {
			return xpElectronicClient.copy(id);
			}

			@@ -23,6 +23,9 @@
			import io.swagger.annotations.ApiOperation;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.poi.ss.usermodel.Workbook;
			import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
			import org.apache.shardingsphere.transaction.core.TransactionType;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.StringUtils;
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;
			@@ -113,22 +116,25 @@
			/**
			* 新增点位
			*/
			@GlobalTransactional(name = "add-point", rollbackFor = Exception.class)

			@PostMapping("/add")
			@ApiOperation(value = "新增点位")
			@Transactional
			@ShardingSphereTransactionType(TransactionType.BASE)
			public R add(@Validated @RequestBody PointAddDto pointAddDto) {
			xpPointClient.add(pointAddDto);
			int temp =1/0;
			return R.ok();
			}
			/**
			* 编辑点位
			*/
			@PostMapping("/edit")
			@Transactional
			@ShardingSphereTransactionType(TransactionType.BASE)
			@ApiOperation(value = "编辑点位")
			public R edit(@Validated@RequestBody PointUpdateDto pointAddDto) {

			return xpPointClient.edit(pointAddDto);
			xpPointClient.edit(pointAddDto);
			return R.ok();
			}
			/**
			* 批量删除点位
			@@ -136,6 +142,8 @@
			@GetMapping("/deletePoint")
			@ResponseBody
			@ApiOperation(value = "删除点位")
			@Transactional
			@ShardingSphereTransactionType(TransactionType.BASE)
			public R deletePoint(@RequestParam("ids") String ids) {
			xpPointClient.deletePoint(ids);
			return R.ok();
			@@ -155,6 +163,8 @@
			@PostMapping("/enableDisable")
			@ResponseBody
			@ApiOperation(value = "启用/禁用")
			@Transactional
			@ShardingSphereTransactionType(TransactionType.BASE)
			public R enableDisable(@RequestBody XpPointEnableDisableDto dto) {
			return xpPointClient.enableDisable(dto);
			}

			@@ -20,6 +20,8 @@
			import com.xiaopeng.operation.service.XpRegionService;
			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.transaction.annotation.Transactional;
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;
			@@ -83,6 +85,7 @@
			@PostMapping("/add")
			@ApiOperation(value = "新增电子围栏")
			@Transactional
			@ShardingSphereTransactionType(TransactionType.BASE)
			public R add(@Validated @RequestBody ElectronicFenceAddDto dto) {
			return xpElectronicFenceService.addElectronic(dto);
			}
			@@ -95,6 +98,8 @@
			@PostMapping("/updateStatus")
			@ResponseBody
			@ApiOperation(value = "修改状态")
			@Transactional
			@ShardingSphereTransactionType(TransactionType.BASE)
			public R updateStatus(@RequestBody ElectronicFenceAreaUpdateStatusDto dto) {
			XpElectronicFenceArea electronicFenceArea = xpElectronicFenceAreaService.getById(dto.getId());
			if (electronicFenceArea == null) {
			@@ -134,6 +139,7 @@
			@PostMapping("/edit")
			@ApiOperation(value = "编辑电子围栏")
			@Transactional
			@ShardingSphereTransactionType(TransactionType.BASE)
			public R edit(@Validated @RequestBody ElectronicFenceUpdateDto dto) {
			return xpElectronicFenceService.editElectronic(dto);
			}
			@@ -144,6 +150,7 @@
			@PostMapping("/copy")
			@ApiOperation(value = "复制电子围栏")
			@Transactional
			@ShardingSphereTransactionType(TransactionType.BASE)
			public R<Long> copy(@RequestParam("id") Integer id) {
			XpElectronicFence electronicFence = xpElectronicFenceService.getById(id);
			if (electronicFence.getStatus()==2){

			@@ -19,6 +19,8 @@
			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;
			@@ -78,9 +80,10 @@
			/**
			* 新增点位
			*/
			@Transactional(rollbackFor = Exception.class)
			@PostMapping("/addPoint")
			@ResponseBody
			@Transactional
			@ShardingSphereTransactionType(TransactionType.BASE)
			@ApiOperation(value = "新增点位")
			public R add(@Validated @RequestBody PointAddDto pointAddDto) {
			XpPoint xpPoint = new XpPoint();
			@@ -94,6 +97,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 +108,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,6 +129,8 @@
			*/
			@PostMapping("/enableDisablePoint")
			@ApiOperation(value = "启用/禁用")
			@Transactional
			@ShardingSphereTransactionType(TransactionType.BASE)
			public R enableDisable(@RequestBody XpPointEnableDisableDto dto) {
			XpPoint xpPoint = xpPointService.getById(dto.getId());
			xpPoint.setOperationStatus(dto.getOperationStatus());

			@@ -7,6 +7,8 @@
			public enum TimeJobType {
			ELECTRONIC_EFFECT("electronic_effect","电子围栏生效"),
			ELECTRONIC_FAILURE("electronic_failure","电子围栏失效");


			private String type;
			private String desc;
			private TimeJobType(String type, String desc) {