From 74b0e0814e37d640596f44ec86d20fa9ecce9ed6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 10:42:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 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 d3d7f11..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
@@ -6,6 +6,8 @@
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;
@@ -31,6 +33,9 @@
@Autowired
private TActivityService activityService;
+
+
+ @RequiresPermissions(value = {"/activity/add"}, logical = Logical.OR)
@PostMapping("/saveActivity")
@ApiOperation(tags = {"管理后台-活动管理"},value = "活动添加")
@Log(title = "【活动管理】添加活动", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@@ -38,6 +43,9 @@
activityService.save(dto);
return AjaxResult.success();
}
+
+
+ @RequiresPermissions(value = {"/activity/del"}, logical = Logical.OR)
@GetMapping("/delete")
@ApiOperation(tags = {"管理后台-活动管理"},value = "活动删除")
@Log(title = "【活动管理】删除活动", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@@ -45,6 +53,9 @@
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)
@@ -52,16 +63,36 @@
activityService.updateById(dto);
return AjaxResult.success();
}
+
+
+ @RequiresPermissions(value = {"/activity/select"}, logical = Logical.OR)
@GetMapping("/getInfo")
- @ApiOperation(tags = {"管理后台-活动管理","小程序-个人中心-活动列表"},value = "活动查看详情")
+ @ApiOperation(tags = {"管理后台-活动管理"},value = "活动查看详情")
public AjaxResult<TActivity> getInfo(Integer id) {
return AjaxResult.ok(activityService.getById(id));
}
- @ApiOperation(tags = {"管理后台-活动管理","小程序-个人中心-活动列表"},value = "活动列表分页查询")
-
+
+
+ @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