Merge branch 'dev' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev

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 上传结果

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java

@@ -44,7 +44,6 @@ public class ModelsController {
      * @param models 筛选条件
      * @param page     分页对象
      * @param size     分页对象
-//     * @param availableRange 可用范围：1表示公开，0表示私有
      * @return 查询结果
      */
     @GetMapping
@@ -53,10 +52,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));
     }
@@ -70,7 +69,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,

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<Dataset> queryByPage(Dataset dataset, PageRequest pageRequest) {
         long total = this.datasetDao.count(dataset);
         return new PageImpl<>(this.datasetDao.queryAllByLimit(dataset, pageRequest), pageRequest, total);
+
     }
 
     /**

ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml

@@ -47,7 +47,7 @@
             <if test="dataset.description != null and dataset.description != ''">
                 and description = #{dataset.description}
             </if>
-            <if test="dataset.availableRange != null and dataset.availableRange != ''">
+            <if test="dataset.availableRange != null">
                 and available_range = #{dataset.availableRange}
             </if>
             <if test="dataset.dataType != null">
@@ -90,7 +90,7 @@
             <if test="dataset.description != null and dataset.description != ''">
                 and description = #{dataset.description}
             </if>
-            <if test="dataset.availableRange != null and dataset.availableRange != ''">
+            <if test="dataset.availableRange != null">
                 and available_range = #{dataset.availableRange}
             </if>
             <if test="dataset.dataType != null">

ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml

@@ -35,12 +35,12 @@
                 and id = #{models.id}
             </if>
             <if test="models.name != null and models.name != ''">
-                and name = #{models.name}
+                and name like "%"#{models.name}"%"
             </if>
             <if test="models.description != null and models.description != ''">
                 and description = #{models.description}
             </if>
-            <if test="models.availableRange != null and models.availableRange != ''">
+            <if test="models.availableRange != null">
                 and available_range = #{models.availableRange}
             </if>
             <if test="models.modelType != null">
@@ -78,12 +78,12 @@
                 and id = #{models.id}
             </if>
             <if test="models.name != null and models.name != ''">
-                and name = #{models.name}
+                and name like "%"#{models.name}"%"
             </if>
             <if test="models.description != null and models.description != ''">
                 and description = #{models.description}
             </if>
-            <if test="models.availableRange != null and models.availableRange != ''">
+            <if test="models.availableRange != null">
                 and available_range = #{models.availableRange}
             </if>
             <if test="models.modelType != null">