From caa2b51bb4133f5a2e59eac242e744fb57f864a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 13:01:44 +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/TAdvertisingController.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
index 7d2b0bd..bc78481 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
@@ -18,6 +18,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -42,8 +43,8 @@
     }
     @GetMapping("/delete")
     @ApiOperation(tags = {"管理后台-广告管理"},value = "广告删除")
-    public AjaxResult delete(Integer id) {
-        advertisingService.removeById(id);
+    public AjaxResult delete(String ids) {
+        advertisingService.removeBatchByIds(Arrays.asList(ids.split(",")));
         return AjaxResult.success();
     }
     @PostMapping("/updateVip")
@@ -57,6 +58,9 @@
     public AjaxResult<TAdvertising> getInfo(Integer id) {
         return AjaxResult.ok(advertisingService.getById(id));
     }
+
+
+
     @ApiOperation(tags = {"管理后台-广告管理"},value = "广告列表分页查询")
     @PostMapping(value = "/pageList")
     public AjaxResult<PageInfo<TAdvertising>> pageList(@RequestBody AdvertisingDTO dto) {
@@ -65,9 +69,10 @@
 
     @ApiOperation(tags = {"小程序-广告管理"},value = "广告列表查询")
     @GetMapping(value = "/list")
-    public AjaxResult<List<TAdvertising>> list() {
+    public AjaxResult<List<TAdvertising>> list(@RequestParam("position") Integer position) {
         return AjaxResult.ok(advertisingService.list(Wrappers.lambdaQuery(TAdvertising.class)
-                .eq(TAdvertising::getStatus, AdvertisingStatusEnum.YES.getCode())));
+                .eq(TAdvertising::getStatus, AdvertisingStatusEnum.YES.getCode())
+                .eq(TAdvertising::getPosition,position)));
     }
 }
 

--
Gitblit v1.7.1