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-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java
index 6b32447..b7b2cbc 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java
@@ -14,6 +14,9 @@
import com.xiaopeng.common.core.constant.CacheConstants;
import com.xiaopeng.common.core.domain.R;
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.service.*;
import com.xiaopeng.operation.service.IXpActicityCouponService;
import com.xiaopeng.operation.service.IXpActicityService;
@@ -172,6 +175,12 @@
@PostMapping("/v1/api/appUserCoupon/add")
@ApiOperation(value = "添加活动", tags = {"管理后台-活动管理"}, response = XpCoupon.class)
+ @AdminOperationLog(
+ businessType = AdminBusinessType.ACTIVITY_MANAGEMENT,
+ operationType = AdminOperationType.ADD,
+ content = "添加活动",
+ appendRequestData = true
+ )
public R<?> add(@RequestBody XpActivityDto dto) {
service.save(dto);
return R.ok();
@@ -180,6 +189,12 @@
@PostMapping("/v1/api/appUserCoupon/{op}")
@ApiOperation(value = "修改活动状态,release,pause,resume,stop,del", tags = {"管理后台-活动管理"}, response = XpCoupon.class)
+ @AdminOperationLog(
+ businessType = AdminBusinessType.ACTIVITY_MANAGEMENT,
+ operationTypeExpression = "#p0 == 'release' ? T(com.xiaopeng.common.log.enums.AdminOperationType).RELEASE : (#p0 == 'del' ? T(com.xiaopeng.common.log.enums.AdminOperationType).DELETE : T(com.xiaopeng.common.log.enums.AdminOperationType).EDIT)",
+ contentExpression = "'修改活动状态:' + #p0 + ',id=' + #p1",
+ appendRequestData = true
+ )
public R<XpActivity> updateById(@PathVariable String op, @RequestParam Long id) {
XpActivity activity = service.getById(id);
--
Gitblit v1.7.1