replace to PageRequest.of

examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/PagingAndSortingSpecification.java

@@ -61,12 +61,12 @@ public abstract class PagingAndSortingSpecification implements QuerySpecificatio
         }
         if (properties != null) {
             Sort sort = Sort.by(Sort.Direction.valueOf(order), properties);
-            pageRequest = new PageRequest(page, size, sort);
+            pageRequest = PageRequest.of(page, size, sort);
         } else if (page != null && size != null) {
-            pageRequest = new PageRequest(page, size);
+            pageRequest = PageRequest.of(page, size);
         } else {
             //TODO 暂时返还一条数据
-            pageRequest = new PageRequest(0, 1);
+            pageRequest = PageRequest.of(0, 1);
         }
         return pageRequest;
     }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examrecord/ExamRecordEntityConvert.java

@@ -158,7 +158,7 @@ public class ExamRecordEntityConvert {
     
 
     public Page<ExamRecordInfo> of(Page<ExamRecordDataEntity> page) {
-        Pageable pageable = new PageRequest(page.getNumber(), page.getSize());
+        Pageable pageable = PageRequest.of(page.getNumber(), page.getSize());
         List<ExamRecordDataEntity> entities = page.getContent();
         if (entities == null || entities.size() == 0) {
             return new PageImpl<ExamRecordInfo>(Lists.newArrayList(), pageable, page.getTotalElements());

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examstudent/ExamStudentEntityConvert.java

@@ -164,7 +164,7 @@ public class ExamStudentEntityConvert {
 
 
     public static Page<ExamStudentInfo> of(Page<ExamStudentEntity> page) {
-        Pageable pageable = new PageRequest(page.getNumber(), page.getSize());
+        Pageable pageable = PageRequest.of(page.getNumber(), page.getSize());
         List<ExamStudentEntity> entities = page.getContent();
         if (entities == null || entities.size() == 0) {
             return new PageImpl<>(Lists.newArrayList(), pageable, page.getTotalElements());

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordServiceImpl.java

@@ -326,7 +326,7 @@ public class ExamRecordServiceImpl implements ExamRecordService {
         });
         //查询总数
         long total = countExamRecordDetailListForPage(query);
-        Pageable pageable = new PageRequest(query.getPageNo() - 1, query.getPageSize());
+        Pageable pageable = PageRequest.of(query.getPageNo() - 1, query.getPageSize());
         Page<ExamRecordDataEntity> page = new PageImpl<ExamRecordDataEntity>(examRecordDataList, pageable, total);
         return examRecordEntityConvert.of(page);
     }
@@ -512,7 +512,7 @@ public class ExamRecordServiceImpl implements ExamRecordService {
         });
         //查询总数
         long total = countExamRecordListForPage(query);
-        Pageable pageable = new PageRequest(query.getPageNo() - 1, query.getPageSize());
+        Pageable pageable = PageRequest.of(query.getPageNo() - 1, query.getPageSize());
 
         Page<ExamRecordDataEntity> page = new PageImpl<ExamRecordDataEntity>(examRecordDataList, pageable, total);
         return examRecordEntityConvert.of(page);