From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
index 4f31a82..d216f92 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
@@ -8,7 +8,7 @@
import com.ruoyi.other.service.BannerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Param;
+import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -28,45 +28,47 @@
public class BannerController {
@Resource
private BannerService bannerService;
- @PostMapping("/index/list")
- @ApiOperation(value = "banner列表", tags = {"小程序-首页"})
- public R<List<Banner>> list(String name, Integer jumpType, Integer position){
+ @GetMapping("/list")
+ @ApiOperation(value = "banner列表", tags = {"小程序-banner"})
+ public R<List<Banner>> list(@ApiParam("名称") String name,
+ @ApiParam("跳转类型（1=无跳转，2=外部链接，3=商品详情，4=秒杀商品详情，5=领券中心）") Integer jumpType,
+ @ApiParam("位置（1=首页，2=商城首页）") Integer position){
List<Banner> list = bannerService.lambdaQuery().like(StringUtils.isNotEmpty(name), Banner::getName, name)
- .eq(Banner::getJumpType, jumpType)
- .eq(Banner::getPosition, position)
+ .eq(jumpType!=null,Banner::getJumpType, jumpType)
+ .eq(position!=null,Banner::getPosition, position)
.list();
return R.ok(list);
}
@PostMapping("/add")
- @ApiOperation(value = "添加", tags = {"后台-广告管理-banner管理"})
+ @ApiOperation(value = "广告管理-banner管理-添加", tags = {"管理后台"})
public R add(@RequestBody Banner banner){
bannerService.save(banner);
return R.ok();
}
- @PostMapping("/delete")
- @ApiOperation(value = "删除", tags = {"后台-广告管理-banner管理"})
+ @GetMapping("/delete")
+ @ApiOperation(value = "广告管理-banner管理-删除", tags = {"管理后台"})
public R delete(@RequestParam Integer id){
bannerService.removeById(id);
return R.ok();
}
@PostMapping("/edit")
- @ApiOperation(value = "修改", tags = {"后台-广告管理-banner管理"})
+ @ApiOperation(value = "广告管理-banner管理-修改", tags = {"管理后台"})
public R edit(@RequestBody Banner banner){
bannerService.updateById(banner);
return R.ok();
}
- @PostMapping("/detail")
- @ApiOperation(value = "详情", tags = {"后台-广告管理-banner管理"})
+ @GetMapping("/detail")
+ @ApiOperation(value = "广告管理-banner管理-详情", tags = {"管理后台"})
public R detail(@RequestParam Integer id){
Banner byId = bannerService.getById(id);
return R.ok(byId);
}
- @PostMapping("/page/list")
- @ApiOperation(value = "列表", tags = {"后台-广告管理--banner"})
+ @GetMapping("/page/list")
+ @ApiOperation(value = "广告管理-banner-列表", tags = {"管理后台"})
public R<Page<Banner>> pagelist(String name, Integer jumpType, Integer position,Integer pageNum,Integer pageSize){
Page<Banner> page = bannerService.lambdaQuery().like(StringUtils.isNotEmpty(name), Banner::getName, name)
- .eq(Banner::getJumpType, jumpType)
- .eq(Banner::getPosition, position)
+ .eq(jumpType!=null,Banner::getJumpType, jumpType)
+ .eq(position!=null,Banner::getPosition, position)
.page(Page.of(pageNum, pageSize));
return R.ok(page);
}
--
Gitblit v1.7.1