Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/StrategyController.java

@@ -1,17 +1,16 @@
package org.springblade.system.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.system.entity.Strategy;
import org.springblade.system.service.IStrategyService;
import org.springframework.data.domain.Page;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -43,16 +42,15 @@
   /**
    * 分页查询
    *
    * @param strategy 筛选条件
    * @param query      分页对象
    * @param query 分页对象
    * @return 查询结果
    */
   @GetMapping("/page")
   @ApiOperationSupport(order = 1)
   @ApiOperation(value = "分页查询", notes = "传入combination，分页参数query")
   public R<IPage<Strategy>> queryByPage(Strategy strategy, Query query) {
      IPage<Strategy> pages = strategyService.page(Condition.getPage(query), Condition.getQueryWrapper(strategy));
      return R.data(pages);
   public R<Page<Strategy>> queryByPage(Query query) {
      Page<Strategy> strategyPage = strategyService.queryAllByPage(query);
      return R.data(strategyPage);
   }

   /**
@@ -90,7 +88,7 @@
   @PostMapping("/remove")
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "删除", notes = "传入ids")
   public ResponseEntity<Boolean> deleteById(List<String> ids) {
   public ResponseEntity<Boolean> deleteById(@ApiParam(value = "主键集合", required = true) @RequestParam List<String> ids) {
      return ResponseEntity.ok(this.strategyService.deleteByIds(ids));
   }