Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-11 89ff1a52320315f24912b58e4e025e35237cf367

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java

@@ -8,7 +8,6 @@
import com.ruoyi.other.service.BannerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -24,7 +23,7 @@
 */
@RestController
@RequestMapping("/banner")
@Api(tags = "轮播图")
@Api("轮播图")
public class BannerController {
    @Resource
    private BannerService bannerService;
@@ -43,7 +42,7 @@
            bannerService.save(banner);
            return R.ok();
      }
      @PostMapping("/delete")
      @GetMapping("/delete")
   @ApiOperation(value = "删除", tags = {"后台-广告管理-banner管理"})
   public R delete(@RequestParam Integer id){
            bannerService.removeById(id);
@@ -55,18 +54,18 @@
            bannerService.updateById(banner);
            return R.ok();
      }
      @PostMapping("/detail")
      @GetMapping("/detail")
   @ApiOperation(value = "详情", tags = {"后台-广告管理-banner管理"})
   public R detail(@RequestParam Integer id){
          Banner byId = bannerService.getById(id);
          return R.ok(byId);
      }
      @PostMapping("/page/list")
      @GetMapping("/page/list")
   @ApiOperation(value = "列表", tags = {"后台-广告管理--banner"})
   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);
    }