优化项目排序

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

@@ -950,8 +950,7 @@ public class ModelsServiceImpl implements ModelsService {
         Map<String, Object> stringObjectMap = JacksonUtil.parseJSONStr2Map(req);
         List<Map<String, Object>> projects = (List<Map<String, Object>>) stringObjectMap.get("projects");
         List<ModelsVo> collect = convert(projects, Constant.Topic_model, modelTagName, modelTypeName);
-        collect.sort(Comparator.comparing(ModelsVo::getPraisesCount).reversed());
-        List<ModelsVo> result = collect.stream().skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
+        List<ModelsVo> result = collect.stream().sorted(Comparator.comparing(ModelsVo::getPraisesCount).reversed()).skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
                 collect(Collectors.toList());
         return new PageImpl<>(result, pageRequest, collect.size());
     }
@@ -980,8 +979,7 @@ public class ModelsServiceImpl implements ModelsService {
         Map<String, Object> stringObjectMap = JacksonUtil.parseJSONStr2Map(req);
         List<Map<String, Object>> projects = (List<Map<String, Object>>) stringObjectMap.get("projects");
         List<ModelsVo> collect = convert(projects, Constant.Topic_model, modelTagName, modelTypeName);
-        collect.sort(Comparator.comparing(ModelsVo::getPraisesCount).reversed());
-        List<ModelsVo> result = collect.stream().skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
+        List<ModelsVo> result = collect.stream().sorted(Comparator.comparing(ModelsVo::getPraisesCount).reversed()).skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
                 collect(Collectors.toList());
         return new PageImpl<>(result, pageRequest, collect.size());
     }

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

@@ -333,8 +333,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         List<Map<String, Object>> projects = (List<Map<String, Object>>) stringObjectMap.get("projects");
 
         List<NewDatasetVo> collect = convert(projects, Constant.Topic_Dataset, dataset.getDataTag(), dataset.getDataType());
-        collect.sort(Comparator.comparing(NewDatasetVo::getPraisesCount).reversed());
-        List<NewDatasetVo> result = collect.stream().skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
+        List<NewDatasetVo> result = collect.stream().sorted(Comparator.comparing(NewDatasetVo::getPraisesCount).reversed()).skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
                 collect(Collectors.toList());
         return new PageImpl<>(result, pageRequest, collect.size());
     }
@@ -357,8 +356,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
             return new PageImpl<>(new ArrayList<>(), pageRequest, 0);
         }
         List<NewDatasetVo> collect = convert(projects, Constant.Topic_Dataset, dataset.getDataTag(), dataset.getDataType());
-        collect.sort(Comparator.comparing(NewDatasetVo::getPraisesCount).reversed());
-        List<NewDatasetVo> result = collect.stream().skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
+        List<NewDatasetVo> result = collect.stream().sorted(Comparator.comparing(NewDatasetVo::getPraisesCount).reversed()).skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
                 collect(Collectors.toList());
         return new PageImpl<>(result, pageRequest, collect.size());
     }