From d6c8f09fd628bd0111de4ee7071844465df9adb1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 28 十月 2024 18:57:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java
index 84e3376..d3d7f11 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java
@@ -3,6 +3,9 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import com.ruoyi.other.api.domain.TActivity;
import com.ruoyi.other.api.domain.TAdvertising;
import com.ruoyi.other.api.dto.AdvertisingDTO;
@@ -11,6 +14,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
/**
* <p>
@@ -28,18 +33,21 @@
private TActivityService activityService;
@PostMapping("/saveActivity")
@ApiOperation(tags = {"管理后台-活动管理"},value = "活动添加")
+ @Log(title = "【活动管理】添加活动", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
public AjaxResult saveActivity(@RequestBody TActivity dto) {
activityService.save(dto);
return AjaxResult.success();
}
@GetMapping("/delete")
@ApiOperation(tags = {"管理后台-活动管理"},value = "活动删除")
- public AjaxResult delete(Integer id) {
- activityService.removeById(id);
+ @Log(title = "【活动管理】删除活动", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
+ public AjaxResult delete(String ids) {
+ activityService.removeBatchByIds(Arrays.asList(ids.split(",")));
return AjaxResult.success();
}
@PostMapping("/updateVip")
@ApiOperation(tags = {"管理后台-活动管理"},value = "活动修改")
+ @Log(title = "【活动管理】修改活动", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
public AjaxResult updateActivity(@RequestBody TActivity dto) {
activityService.updateById(dto);
return AjaxResult.success();
--
Gitblit v1.7.1