From 08cc6d5cf7e93b75cfabe7dcc2aeaa9afa1117eb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 五月 2026 15:01:47 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.1
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java
index ea7a72d..b1ddae2 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java
@@ -21,6 +21,9 @@
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.utils.bean.BeanUtils;
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.map.constant.I18nKeyConstant;
import com.xiaopeng.map.service.*;
import com.xiaopeng.map.service.serviceimpl.BootCommonService;
@@ -129,6 +132,12 @@
*/
@PostMapping("/add")
@ApiOperation(value = "新增电子围栏")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.ELECTRONIC_FENCE_MANAGEMENT,
+ operationType = AdminOperationType.ADD,
+ content = "新增电子围栏",
+ appendRequestData = true
+ )
public R add(@Valid @RequestBody ElectronicFenceAddDto dto) {
validateFenceTime(dto.getStatus(), dto.getEffectType(), dto.getEffectTime(), dto.getFailureType(), dto.getFailureTime());
return xpElectronicFenceService.addElectronic(dto);
@@ -142,6 +151,12 @@
@PostMapping("/updateStatus")
@ResponseBody
@ApiOperation(value = "修改状态")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.ELECTRONIC_FENCE_MANAGEMENT,
+ operationType = AdminOperationType.EDIT,
+ content = "修改电子围栏状态",
+ appendRequestData = true
+ )
public R updateStatus(@RequestBody ElectronicFenceAreaUpdateStatusDto dto) {
XpElectronicFenceArea electronicFenceArea = xpElectronicFenceAreaService.getById(dto.getId());
if (electronicFenceArea == null) {
@@ -247,6 +262,12 @@
@ApiOperation(value = "编辑电子围栏")
@Transactional
@ShardingSphereTransactionType(TransactionType.BASE)
+ @AdminOperationLog(
+ businessType = AdminBusinessType.ELECTRONIC_FENCE_MANAGEMENT,
+ operationType = AdminOperationType.EDIT,
+ content = "编辑电子围栏",
+ appendRequestData = true
+ )
public R edit(@Validated @RequestBody ElectronicFenceUpdateDto dto) {
validateFenceTime(dto.getStatus(), dto.getEffectType(), dto.getEffectTime(), dto.getFailureType(), dto.getFailureTime());
return xpElectronicFenceService.editElectronic(dto);
@@ -341,6 +362,12 @@
@ApiOperation(value = "复制电子围栏")
@Transactional
@ShardingSphereTransactionType(TransactionType.BASE)
+ @AdminOperationLog(
+ businessType = AdminBusinessType.ELECTRONIC_FENCE_MANAGEMENT,
+ operationType = AdminOperationType.ADD,
+ contentExpression = "'复制电子围栏,id=' + #p0",
+ appendRequestData = false
+ )
public R<Long> copy(@RequestParam("id") Integer id) {
XpElectronicFence electronicFence = xpElectronicFenceService.getById(id);
if (electronicFence.getStatus()==2){
--
Gitblit v1.7.1