diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java index 79d30f0..2f258b9 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java @@ -39,17 +39,22 @@ public class DatasetController { * 分页查询 * * @param dataset 筛选条件 - * @param page 页数 - * @param size 大小 + * @param page 页数 + * @param size 大小 + * @param availableRange 可用范围:1表示公开,0表示私有 * @return 查询结果 */ @GetMapping - @ApiOperation("分页查询") - public AjaxResult queryByPage(Dataset dataset, int page,int size) { - PageRequest pageRequest = PageRequest.of(page,size); + @ApiOperation("分页查询,根据available_range筛选,1公开0私有") + public AjaxResult queryByPage(Dataset dataset, @RequestParam("page") int page, + @RequestParam("size") int size, + @RequestParam("available_range") int availableRange) { + dataset.setAvailableRange(availableRange); // 设置筛选条件 + PageRequest pageRequest = PageRequest.of(page, size); return AjaxResult.success(this.datasetService.queryByPage(dataset, pageRequest)); } + /** * 通过主键查询单条数据 * diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java index 3d6ef2a..3be5597 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java @@ -2,6 +2,7 @@ package com.ruoyi.platform.controller.model; import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.platform.domain.Dataset; import com.ruoyi.platform.domain.Models; import com.ruoyi.platform.domain.ModelsVersion; import com.ruoyi.platform.service.ModelsService; @@ -39,13 +40,17 @@ public class ModelsController { * @param models 筛选条件 * @param page 分页对象 * @param size 分页对象 + * @param availableRange 可用范围:1表示公开,0表示私有 * @return 查询结果 */ @GetMapping - @ApiOperation("分页查询") - public AjaxResult queryByPage(Models models, int page, int size) { - PageRequest pageRequest = PageRequest.of(page,size); - return AjaxResult.success(this.modelsService.queryByPage(models, pageRequest)); + @ApiOperation("分页查询,根据available_range筛选,1公开0私有") + public AjaxResult queryByPage(Models models, @RequestParam("page") int page, + @RequestParam("size") int size, + @RequestParam("available_range") int availableRange) { + models.setAvailableRange(availableRange); // 设置筛选条件 + PageRequest pageRequest = PageRequest.of(page, size); + return AjaxResult.success(this.modelsService.queryByPage(models, pageRequest)); } /**