From 4f8fa1c628bc54b28e9dcd32f8b2bb3bac2ba7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Tue, 19 Mar 2024 14:36:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E5=85=AC=E5=BC=80=EF=BC=8C=E7=A7=81=E6=9C=89=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/dataset/DatasetController.java | 18 ++++++++++++++---- .../controller/model/ModelsController.java | 5 ++--- .../service/impl/DatasetServiceImpl.java | 1 + .../managementPlatform/DatasetDaoMapper.xml | 4 ++-- .../managementPlatform/ModelsDaoMapper.xml | 8 ++++---- 5 files changed, 23 insertions(+), 13 deletions(-) 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 4e38978b..4b1ecf3b 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 @@ -49,10 +49,15 @@ public class DatasetController { * @return 查询结果 */ @GetMapping - @ApiOperation("数据集广场公开数据集分页查询1公开0私有") + @ApiOperation("数据集广场公开数据集分页查询,根据data_type筛选，1公开0私有") public AjaxResult queryByPage(Dataset dataset, @RequestParam("page") int page, - @RequestParam("size") int size) { + @RequestParam("size") int size, + //@RequestParam("available_range") int availableRange , + @RequestParam(value = "data_type", required = false) String dataType) { + if (dataType != null) { // 仅当dataType有值时设置 + dataset.setDataType(dataType); + } dataset.setAvailableRange(1); PageRequest pageRequest = PageRequest.of(page, size); return AjaxResult.success(this.datasetService.queryByPage(dataset, pageRequest)); @@ -60,14 +65,18 @@ public class DatasetController { @GetMapping("/personalDatasets") - @ApiOperation("分页查询当前用户的个人数据集") + @ApiOperation("分页查询当前用户的个人数据集，根据data_type筛选,1公开0私有") public AjaxResult queryByPagePersonal(Dataset dataset, @RequestParam("page") int page, - @RequestParam("size") int size) { + @RequestParam("size") int size, + @RequestParam(value = "data_type", required = false) String dataType) { // 获取当前用户的认证信息 LoginUser loginUser = SecurityUtils.getLoginUser(); // 设置筛选条件 dataset.setCreateBy(loginUser.getUsername()); dataset.setAvailableRange(0); + if (dataType != null) { // 仅当dataType有值时设置 + dataset.setDataType(dataType); + } PageRequest pageRequest = PageRequest.of(page, size); return AjaxResult.success(this.datasetService.queryByPage(dataset, pageRequest)); } @@ -171,6 +180,7 @@ public class DatasetController { return AjaxResult.success(this.datasetService.uploadDataset(files)); } + /** * 从流水线上传数据集，不会给二进制文件，这边只存路径 * @return 上传结果 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 3d675379..9d07f812 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 @@ -42,7 +42,6 @@ public class ModelsController { * @param models 筛选条件 * @param page 分页对象 * @param size 分页对象 -// * @param availableRange 可用范围：1表示公开，0表示私有 * @return 查询结果 */ @GetMapping @@ -51,10 +50,10 @@ public class ModelsController { @RequestParam("size") int size, //@RequestParam("available_range") int availableRange, @RequestParam(value = "model_type", required = false) String modelType) { -// models.setAvailableRange(availableRange); // 设置筛选条件 if (modelType != null){ models.setModelType(modelType); // 设置筛选条件 } + models.setAvailableRange(1); // 设置筛选条件 PageRequest pageRequest = PageRequest.of(page, size); return AjaxResult.success(this.modelsService.queryByPage(models, pageRequest)); } @@ -68,7 +67,7 @@ public class ModelsController { * @param size 分页对象 * @return 查询结果 */ - @GetMapping("/personalDatasets") + @GetMapping("/personalModels") @ApiOperation("分页查询当前用户的个人模型 ，根据model_type筛选") public AjaxResult queryByPagePersonal(Models models, @RequestParam("page") int page, @RequestParam("size") int size, diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java index 77f21667..b01ae0b1 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java @@ -100,6 +100,7 @@ public class DatasetServiceImpl implements DatasetService { public Page queryByPage(Dataset dataset, PageRequest pageRequest) { long total = this.datasetDao.count(dataset); return new PageImpl<>(this.datasetDao.queryAllByLimit(dataset, pageRequest), pageRequest, total); + } /** diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml index ac1a5b3c..d7a0ec1d 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml @@ -47,7 +47,7 @@ and description = #{dataset.description} - + and available_range = #{dataset.availableRange} @@ -90,7 +90,7 @@ and description = #{dataset.description} - + and available_range = #{dataset.availableRange} diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml index bb6d54be..672f8a37 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml @@ -35,12 +35,12 @@ and id = #{models.id} - and name = #{models.name} + and name like "%"#{models.name}"%" and description = #{models.description} - + and available_range = #{models.availableRange} @@ -78,12 +78,12 @@ and id = #{models.id} - and name = #{models.name} + and name like "%"#{models.name}"%" and description = #{models.description} - + and available_range = #{models.availableRange}