From 67d06a785d5fc4524639ace27651c01ff05a4b58 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 29 五月 2025 22:31:33 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java |   44 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 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 cd4eb1c..f704b5c 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,11 @@
 
 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.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.other.api.domain.TActivity;
 import com.ruoyi.other.api.domain.TAdvertising;
 import com.ruoyi.other.api.dto.AdvertisingDTO;
@@ -11,6 +16,8 @@
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
 
 /**
  * <p>
@@ -26,33 +33,66 @@
 
     @Autowired
     private TActivityService activityService;
+    
+    
+    @RequiresPermissions(value = {"/activity/add"}, logical = Logical.OR)
     @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();
     }
+    
+    
+    @RequiresPermissions(value = {"/activity/del"}, logical = Logical.OR)
     @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();
     }
+    
+    
+    @RequiresPermissions(value = {"/activity/update"}, logical = Logical.OR)
     @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();
     }
+    
+    
+    @RequiresPermissions(value = {"/activity/select"}, logical = Logical.OR)
     @GetMapping("/getInfo")
     @ApiOperation(tags = {"管理后台-活动管理"},value = "活动查看详情")
     public AjaxResult<TActivity> getInfo(Integer id) {
         return AjaxResult.ok(activityService.getById(id));
     }
+    
+    
+    @GetMapping("/getInfo1")
+    @ApiOperation(tags = {"小程序-个人中心-活动列表"},value = "活动查看详情")
+    public AjaxResult<TActivity> getInfo1(Integer id) {
+        return AjaxResult.ok(activityService.getById(id));
+    }
+    
+    
+    
     @ApiOperation(tags = {"管理后台-活动管理"},value = "活动列表分页查询")
+    @RequiresPermissions(value = {"/activity/list"}, logical = Logical.OR)
     @PostMapping(value = "/pageList")
     public AjaxResult<PageInfo<TActivity>> pageList(@RequestBody AdvertisingDTO dto) {
         return AjaxResult.ok(activityService.pageList(dto));
     }
+    
+    
+    @ApiOperation(tags = {"小程序-个人中心-活动列表"},value = "活动列表分页查询")
+    @PostMapping(value = "/pageList1")
+    public AjaxResult<PageInfo<TActivity>> pageList1(@RequestBody AdvertisingDTO dto) {
+        return AjaxResult.ok(activityService.pageList(dto));
+    }
 }
 

--
Gitblit v1.7.1