deason 4 rokov pred
rodič
commit
b23ce43813

+ 1 - 1
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/CoursePropertyController.java

@@ -64,7 +64,7 @@ public class CoursePropertyController extends ControllerSupport {
 
         coursePropertyDto.setOrgId(user.getRootOrgId());
 
-        PageRequest pageRequest = PageRequest.of(curPage - 1, pageSize, new Sort(Direction.DESC, "updateTime"));
+        PageRequest pageRequest = PageRequest.of(curPage - 1, pageSize, Sort.by(Direction.DESC, "updateTime"));
         Page<CourseProperty> coursePropertiesPage = coursePropertyService.findList(coursePropertyDto, pageRequest);
 
         return new ResponseEntity<>(coursePropertiesPage, HttpStatus.OK);

+ 2 - 2
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/PaperStructService.java

@@ -85,7 +85,7 @@ public class PaperStructService {
         }
 
         long count = this.mongoTemplate.count(query, PaperStruct.class);
-        query.with(new Sort(new Sort.Order(Sort.Direction.DESC, "createTime")));
+        query.with(Sort.by(Sort.by.Order(Sort.Direction.DESC, "createTime")));
         query.limit(pageSize);
         query.skip((curPage - 1L) * pageSize);
 
@@ -120,7 +120,7 @@ public class PaperStructService {
                     .in("", searchInfo.getCourseNo()));
         }
         query.addCriteria(Criteria.where("orgId").is(searchInfo.getOrgId()));
-        query.with(new Sort(new Sort.Order(Sort.Direction.DESC, "createTime")));
+        query.with(Sort.by(Sort.by.Order(Sort.Direction.DESC, "createTime")));
         List<PaperStruct> paperList = this.mongoTemplate.find(query, PaperStruct.class);
         return paperList;
     }

+ 2 - 2
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/PaperDetailUnitServiceImpl.java

@@ -372,8 +372,8 @@ public class PaperDetailUnitServiceImpl implements PaperDetailUnitService {
     public List<PaperDetailUnit> findByPaperAndSort(Paper paper) {
         Query query = new Query();
         query.addCriteria(Criteria.where("paper").is(paper));
-        query.with(new Sort(new Order(Direction.ASC, "number")));
-        query.with(new Sort(new Order(Direction.ASC, "createTime")));
+        query.with(Sort.by(new Order(Direction.ASC, "number")));
+        query.with(Sort.by(new Order(Direction.ASC, "createTime")));
         return this.mongoTemplate.find(query, PaperDetailUnit.class);
     }
 

+ 4 - 4
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/PaperServiceImpl.java

@@ -224,7 +224,7 @@ public class PaperServiceImpl implements PaperService {
             query.addCriteria(Criteria.where("lastModifyName").regex(".*?\\.*" + lastModifyName + ".*"));
         }
         long count = this.mongoTemplate.count(query, Paper.class);
-        query.with(new Sort(new Order(Direction.DESC, "createTime")));
+        query.with(Sort.by(new Order(Direction.DESC, "createTime")));
         query.limit(pageSize);
         query.skip((curPage - 1L) * pageSize);
         List<Paper> paperList = this.mongoTemplate.find(query, Paper.class);
@@ -380,7 +380,7 @@ public class PaperServiceImpl implements PaperService {
             query.addCriteria(Criteria.where("lastModifyName").regex(".*?\\.*" + lastModifyName + ".*"));
         }
         long count = this.mongoTemplate.count(query, Paper.class);
-        query.with(new Sort(new Order(Direction.DESC, "createTime")));
+        query.with(Sort.by(new Order(Direction.DESC, "createTime")));
         query.limit(pageSize);
         query.skip((curPage - 1L) * pageSize);
         List<Paper> paperList = this.mongoTemplate.find(query, Paper.class);
@@ -414,7 +414,7 @@ public class PaperServiceImpl implements PaperService {
             query.addCriteria(Criteria.where("lastModifyName").regex(".*?\\.*" + lastModifyName + ".*"));
         }
         long count = this.mongoTemplate.count(query, Paper.class);
-        query.with(new Sort(new Order(Direction.DESC, "createTime")));
+        query.with(Sort.by(new Order(Direction.DESC, "createTime")));
         query.limit(pageSize);
         query.skip((curPage - 1L) * pageSize);
         List<Paper> paperList = this.mongoTemplate.find(query, Paper.class);
@@ -1140,7 +1140,7 @@ public class PaperServiceImpl implements PaperService {
         query.addCriteria(Criteria.where("course.code").is(paperSearchInfo.getCourseNo()));
         query.addCriteria(Criteria.where("id").nin(selectedIds));
         long total = this.mongoTemplate.count(query, Paper.class);
-        query.with(new Sort(new Order(Direction.DESC, "createTime")));
+        query.with(Sort.by(new Order(Direction.DESC, "createTime")));
         query.limit(pageSize);
         query.skip((curPage - 1L) * pageSize);
         List<Paper> paperList = this.mongoTemplate.find(query, Paper.class);

+ 1 - 1
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/QuesServiceImpl.java

@@ -333,7 +333,7 @@ public class QuesServiceImpl implements QuesService {
             query.addCriteria(Criteria.where("quesBody").regex(pattern));
         }
         long total = this.mongoTemplate.count(query, Question.class);
-        query.with(new Sort(new Order(Direction.DESC, "id")));
+        query.with(Sort.by(new Order(Direction.DESC, "id")));
         query.limit(pageSize);
         query.skip((curPage - 1L) * pageSize);
         List<Question> questionList = this.mongoTemplate.find(query, Question.class);