replace to Sort.by

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamController.java

@@ -211,7 +211,7 @@ public class ExamController extends ControllerSupport {
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
 
-        PageRequest pageRequest = PageRequest.of(0, 50, new Sort(Direction.DESC, "updateTime"));
+        PageRequest pageRequest = PageRequest.of(0, 50, Sort.by(Direction.DESC, "updateTime"));
 
         Page<ExamCourseRelationEntity> page = examCourseRelationRepo.findAll(specification,
                 pageRequest);
@@ -250,7 +250,7 @@ public class ExamController extends ControllerSupport {
                                           @RequestParam(required = false) String propertyKeys) {
         User accessUser = getAccessUser();
 
-        PageRequest pageable = PageRequest.of(curPage, pageSize, new Sort(Direction.DESC, "updateTime", "id"));
+        PageRequest pageable = PageRequest.of(curPage, pageSize, Sort.by(Direction.DESC, "updateTime", "id"));
 
         UserDataRule userDataRule = super.getUserDataRule(DataRuleType.EXAM);
         if (userDataRule.assertEmptyQueryResult()) {
@@ -398,7 +398,7 @@ public class ExamController extends ControllerSupport {
         };
 
         PageRequest pageRequest = PageRequest.of(0, 100,
-                new Sort(Direction.DESC, "updateTime", "id"));
+                Sort.by(Direction.DESC, "updateTime", "id"));
         Page<ExamEntity> page = examRepo.findAll(specification, pageRequest);
 
         Iterator<ExamEntity> iterator = page.iterator();

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamStageController.java

@@ -131,7 +131,7 @@ public class ExamStageController extends ControllerSupport {
         };
 
         PageRequest pageRequest = PageRequest.of(curPage, pageSize,
-                new Sort(Sort.Direction.DESC, "stageOrder"));
+                Sort.by(Sort.Direction.DESC, "stageOrder"));
 
         Page<ExamStageEntity> page = examStageRepo.findAll(specification, pageRequest);
 
@@ -204,7 +204,7 @@ public class ExamStageController extends ControllerSupport {
         };
 
         PageRequest pageRequest = PageRequest.of(0, 100,
-                new Sort(Sort.Direction.ASC, "stageOrder"));
+                Sort.by(Sort.Direction.ASC, "stageOrder"));
         Page<ExamStageEntity> page = examStageRepo.findAll(specification, pageRequest);
 
         Iterator<ExamStageEntity> iterator = page.iterator();

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamStudentController.java

@@ -179,7 +179,7 @@ public class ExamStudentController extends ControllerSupport {
             @RequestParam(required = false, defaultValue = "false") Boolean skipRule) {
 
         User accessUser = getAccessUser();
-        PageRequest pageable = PageRequest.of(curPage, pageSize, new Sort(Direction.DESC, "updateTime", "id"));
+        PageRequest pageable = PageRequest.of(curPage, pageSize, Sort.by(Direction.DESC, "updateTime", "id"));
 
         UserDataRule orgDataRule = super.getUserDataRule(DataRuleType.ORG);
         UserDataRule courseDataRule = super.getUserDataRule(DataRuleType.COURSE);

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/provider/ExamStudentCloudServiceProvider.java

@@ -391,7 +391,7 @@ public class ExamStudentCloudServiceProvider extends ControllerSupport
         };
 
         PageRequest pageRequest = PageRequest.of(curPage, pageSize,
-                new Sort(Direction.DESC, "updateTime", "id"));
+                Sort.by(Direction.DESC, "updateTime", "id"));
 
         Page<ExamStudentEntity> examStudents = examStudentRepo.findAll(specification, pageRequest);
 

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/ExamServiceImpl.java

@@ -842,7 +842,7 @@ public class ExamServiceImpl implements ExamService {
             }
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
-        PageRequest pageRequest = PageRequest.of(curPage, pageSize, new Sort(Sort.Direction.DESC, "creationTime"));
+        PageRequest pageRequest = PageRequest.of(curPage, pageSize, Sort.by(Sort.Direction.DESC, "creationTime"));
         return new PageInfo<>(examIpLimitRepo.findAll(spec, pageRequest));
     }
 

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/NoticeServiceImpl.java

@@ -138,7 +138,7 @@ public class NoticeServiceImpl implements NoticeService {
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
         PageRequest pageRequest = PageRequest.of(curPage, pageSize,
-                new Sort(Sort.Direction.DESC, "creationTime"));
+                Sort.by(Sort.Direction.DESC, "creationTime"));
         Page<NoticeEntity> pagedNoticeEntityList = noticeRepo.findAll(specification, pageRequest);
         List<Long> noticeIdList = pagedNoticeEntityList.stream().map(p -> p.getId())
                 .collect(Collectors.toList());

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/OnGoingExamServiceImpl.java

@@ -126,7 +126,7 @@ public class OnGoingExamServiceImpl implements OnGoingExamService {
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
 
-        PageRequest pageRequest = PageRequest.of(0, 100, new Sort(Direction.ASC, "beginTime"));
+        PageRequest pageRequest = PageRequest.of(0, 100, Sort.by(Direction.ASC, "beginTime"));
 
         List<ExamSpecialSettingsEntity> entityList = examSpecialSettingsRepo
                 .findAll(specification, pageRequest).getContent();
@@ -160,7 +160,7 @@ public class OnGoingExamServiceImpl implements OnGoingExamService {
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
 
-        PageRequest pageRequest = PageRequest.of(0, 100, new Sort(Direction.ASC, "beginTime"));
+        PageRequest pageRequest = PageRequest.of(0, 100, Sort.by(Direction.ASC, "beginTime"));
 
         List<ExamSpecialSettingsEntity> entityList = examSpecialSettingsRepo
                 .findAll(specification, pageRequest).getContent();
@@ -195,7 +195,7 @@ public class OnGoingExamServiceImpl implements OnGoingExamService {
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
 
-        PageRequest pageRequest = PageRequest.of(0, 100, new Sort(Direction.ASC, "beginTime"));
+        PageRequest pageRequest = PageRequest.of(0, 100, Sort.by(Direction.ASC, "beginTime"));
 
         List<ExamSpecialSettingsEntity> entityList = examSpecialSettingsRepo
                 .findAll(specification, pageRequest).getContent();