修改分页查询bug

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java

@@ -55,12 +55,17 @@ public class NewDatasetFromGitController {
 
     @GetMapping("/queryDatasets")
     @ApiOperation("数据集广场公开数据集分页查询,根据data_type,data_tag筛选，true公开false私有")
-    public AjaxResult queryDatasets(Dataset dataset, @RequestParam("page") int page,
+    public AjaxResult queryDatasets(@RequestParam("page") int page,
                                     @RequestParam("size") int size,
                                     @RequestParam(value = "is_public") Boolean isPublic,
                                     @RequestParam(value = "data_type", required = false) String dataType,
-                                    @RequestParam(value = "data_tag", required = false) String dataTag) throws Exception {
+                                    @RequestParam(value = "data_tag", required = false) String dataTag,
+                                    @RequestParam(value = "name", required = false) String name) throws Exception {
         PageRequest pageRequest = PageRequest.of(page, size);
+        Dataset dataset = new Dataset();
+        dataset.setDataTag(dataTag);
+        dataset.setDataType(dataType);
+        dataset.setName(name);
         if (isPublic) {
             return AjaxResult.success(this.newDatasetService.newPubilcQueryByPage(dataset, pageRequest));
         } else {

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java

@@ -229,9 +229,6 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         String userReq = jedis.get(ci4sUsername + "_gitUserInfo");
         Map<String, Object> userInfo = JsonUtils.jsonToMap(userReq);
         // 拼接查询url
-        String datasetTagName = dataset.getDatasetTagName();
-        String datasetTypeName = dataset.getDatasetTypeName();
-
         String url = gitendpoint + "/api/users/" + userInfo.get("login") + "/projects.json?category=manage";
 
         String name = dataset.getName();
@@ -242,7 +239,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         Map<String, Object> stringObjectMap = JacksonUtil.parseJSONStr2Map(req);
         List<Map<String, Object>> projects = (List<Map<String, Object>>) stringObjectMap.get("projects");
 
-        List<NewDatasetVo> collect = convert(projects, "ci4s-dataset", datasetTagName, datasetTypeName);
+        List<NewDatasetVo> collect = convert(projects, "ci4s-dataset", dataset.getDataTag(), dataset.getDataType());
         List<NewDatasetVo> result = collect.stream().skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
                 collect(Collectors.toList());
         return new PageImpl<>(result, pageRequest, collect.size());
@@ -258,9 +255,6 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         Map<String, Object> userInfo = JsonUtils.jsonToMap(userReq);
         Integer userId = (Integer) userInfo.get("user_id");
         // 拼接查询url
-        String datasetTagName = dataset.getDatasetTagName();
-        String datasetTypeName = dataset.getDatasetTypeName();
-
         String url = gitendpoint + "/api/projects.json?user_id=" + userId + "&sort_by=praises_count";
 
         String name = dataset.getName();
@@ -274,7 +268,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         if (projects == null) {
             return new PageImpl<>(new ArrayList<>(), pageRequest, 0);
         }
-        List<NewDatasetVo> collect = convert(projects, "ci4s-dataset", datasetTagName, datasetTypeName);
+        List<NewDatasetVo> collect = convert(projects, "ci4s-dataset", dataset.getDataTag(), dataset.getDataType());
         List<NewDatasetVo> result = collect.stream().skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
                 collect(Collectors.toList());
         return new PageImpl<>(result, pageRequest, collect.size());
@@ -443,8 +437,8 @@ public class NewDatasetServiceImpl implements NewDatasetService {
                     if (topics != null && topics.size() > 0 && datasetTopic.equals(topics.get(0).get("name"))) {
                         String datasettag = (String) topics.get(1).get("name");
                         String datasetype = (String) topics.get(2).get("name");
-                        datasettag = datasettag.substring("modeltag_".length());
-                        datasetype = datasetype.substring("modeltype_".length());
+                        datasettag = datasettag.substring("datatag-".length());
+                        datasetype = datasetype.substring("datatype-".length());
                         if (StringUtils.isNotEmpty(datasetTagName) && !datasetTagName.toLowerCase().equals(datasettag)) {
                             continue;
                         }