From 8cb20ea4bfc998430b7ae4b985675261126d2cae Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 08 十月 2024 15:13:54 +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 | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 49 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 c3ffe4b..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
@@ -1,9 +1,21 @@
package com.ruoyi.other.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+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;
+import com.ruoyi.other.service.TActivityService;
+import com.ruoyi.other.service.TAdvertisingService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.Arrays;
/**
* <p>
@@ -14,8 +26,42 @@
* @since 2024-08-06
*/
@RestController
-@RequestMapping("/t-activity")
+@RequestMapping("/activity")
public class TActivityController {
+ @Autowired
+ 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 = "活动删除")
+ @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();
+ }
+ @GetMapping("/getInfo")
+ @ApiOperation(tags = {"管理后台-活动管理","小程序-个人中心-活动列表"},value = "活动查看详情")
+ public AjaxResult<TActivity> getInfo(Integer id) {
+ return AjaxResult.ok(activityService.getById(id));
+ }
+ @ApiOperation(tags = {"管理后台-活动管理","小程序-个人中心-活动列表"},value = "活动列表分页查询")
+
+ @PostMapping(value = "/pageList")
+ public AjaxResult<PageInfo<TActivity>> pageList(@RequestBody AdvertisingDTO dto) {
+ return AjaxResult.ok(activityService.pageList(dto));
+ }
}
--
Gitblit v1.7.1