From aefe81a52fcbda2175b40575982d18e648e7013c Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 08 七月 2025 11:36:22 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java
index 766a27d..27e8388 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java
@@ -3,17 +3,22 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.domain.dto.MgtActivityEditDto;
+import com.ruoyi.goods.domain.dto.MgtActivityListDto;
import com.ruoyi.goods.domain.dto.MgtActivityPageDto;
import com.ruoyi.goods.domain.dto.MgtActivityRecordPageDto;
import com.ruoyi.goods.domain.vo.MgtActivityGetVo;
+import com.ruoyi.goods.domain.vo.MgtActivityListVo;
import com.ruoyi.goods.domain.vo.MgtActivityPageVo;
import com.ruoyi.goods.domain.vo.MgtActivityRecordPageVo;
import com.ruoyi.goods.service.activity.ActivityService;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -30,7 +35,7 @@
* @Date 2023/6/14 10:17
* @Version 1.0
*/
-@Api(value = "平台端活动相关接口", tags = "平台端活动相关接口", description = "平台端活动相关接口")
+@Api(value = "管理后台活动相关接口", tags = "管理后台活动相关接口", description = "管理后台活动相关接口")
@RestController
@RequestMapping("/mgt/activity")
public class MgtActivityController {
@@ -39,8 +44,9 @@
private ActivityService activityService;
@RequestMapping(value = "/editMgtActivity", method = RequestMethod.POST)
+ @Log(title = "活动管理", businessType = BusinessType.UPDATE,operContent = "编辑活动")
@ApiOperation(value = "平台编辑活动")
- public R editMgtActivity(@RequestBody MgtActivityEditDto mgtActivityEditDto) {
+ public R editMgtActivity(@Validated @RequestBody MgtActivityEditDto mgtActivityEditDto) {
Long userId = SecurityUtils.getUserId();
mgtActivityEditDto.setUserId(userId);
activityService.editMgtActivity(mgtActivityEditDto);
@@ -67,6 +73,7 @@
}
@RequestMapping(value = "/deleteMgtActivity", method = RequestMethod.POST)
+ @Log(title = "活动管理", businessType = BusinessType.DELETE,operContent = "删除活动")
@ApiOperation(value = "平台删除活动")
public R deleteMgtActivity(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
@@ -87,12 +94,35 @@
@RequestMapping(value = "/exportPageMgtActivityRecord", method = RequestMethod.POST)
@ApiOperation(value = "导出活动参与记录列表")
- public void exportPageMgtActivityRecord(@RequestBody MgtActivityRecordPageDto mgtActivityRecordPageDto, HttpServletResponse response) {
+ public void exportPageMgtActivityRecord( MgtActivityRecordPageDto mgtActivityRecordPageDto, HttpServletResponse response) {
Page<MgtActivityRecordPageVo> page = new Page<>();
- page.setSize(2000);
- page.setCurrent(1);
+ if(mgtActivityRecordPageDto.getPageSize() > 5000){
+ page.setSize(5000);
+ page.setCurrent(1);
+ }else{
+ page.setSize(mgtActivityRecordPageDto.getPageSize());
+ page.setCurrent(mgtActivityRecordPageDto.getPageNum());
+ }
List<MgtActivityRecordPageVo> activityRecordPageVoList = activityService.pageMgtActivityRecord(page,mgtActivityRecordPageDto);
ExcelUtil<MgtActivityRecordPageVo> util = new ExcelUtil<MgtActivityRecordPageVo>(MgtActivityRecordPageVo.class);
util.exportExcel(response, activityRecordPageVoList, "商品列表");
}
+
+ @RequestMapping(value = "/listMgtActivity", method = RequestMethod.POST)
+ @ApiOperation(value = "获取活动列表")
+ public R<List<MgtActivityListVo>> listMgtActivity(@RequestBody MgtActivityListDto mgtActivityListDto) {
+
+ List<MgtActivityListVo> activityListVoList = activityService.listMgtActivity(mgtActivityListDto);
+ return R.ok(activityListVoList);
+ }
+
+ @RequestMapping(value = "/endImmediately", method = RequestMethod.POST)
+ @Log(title = "活动管理", businessType = BusinessType.UPDATE,operContent = "立即结束")
+ @ApiOperation(value = "立即结束【2.0】")
+ public R endImmediately(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtBaseGetDto.setUserId(userId);
+ return activityService.endImmediately(mgtBaseGetDto);
+
+ }
}
--
Gitblit v1.7.1