replace to Sort.by

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/AppController.java

@@ -27,7 +27,7 @@ public class AppController extends ControllerSupport {
     @ApiOperation(value = "查询所有应用")
     @GetMapping("getAllApp")
     public List<AppEntity> getAllApp() {
-        Sort sort = new Sort(Sort.Direction.ASC, "id");
+        Sort sort = Sort.by(Sort.Direction.ASC, "id");
         return appRepo.findAll(sort);
     }
 

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/CourseController.java

@@ -105,7 +105,7 @@ public class CourseController extends ControllerSupport {
                                             @RequestParam(required = false) Long specialtyId) {
         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.COURSE);
         if (userDataRule.assertEmptyQueryResult()) {
@@ -215,7 +215,7 @@ public class CourseController 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<CourseEntity> page = courseRepo.findAll(specification, pageRequest);
 
         Iterator<CourseEntity> iterator = page.iterator();

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/OrgController.java

@@ -524,7 +524,7 @@ public class OrgController 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<OrgEntity> page = orgRepo.findAll(specification, pageRequest);
         Iterator<OrgEntity> iterator = page.iterator();
         List<OrgEntity> list = Lists.newArrayList();
@@ -567,7 +567,7 @@ public class OrgController extends ControllerSupport {
             throw new StatusException("001251", "total is larger than 1000");
         }
 
-        Sort sort = new Sort(Direction.ASC, "id");
+        Sort sort = Sort.by(Direction.ASC, "id");
         List<OrgEntity> orgEntityList = orgRepo.findAll(specification, sort);
 
         List<OrgDomain> ret = Lists.newArrayList();

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/ResourceController.java

@@ -83,7 +83,7 @@ public class ResourceController extends ControllerSupport {
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
         PageRequest pageRequest = PageRequest.of(pageNo, pageSize,
-                new Sort(Direction.ASC, "isFile").and(new Sort(Direction.DESC, "creationTime")));
+                Sort.by(Direction.ASC, "isFile").and(Sort.by(Direction.DESC, "creationTime")));
 
         Page<ResourceEntity> page = resourceRepo.findAll(specification, pageRequest);
         Iterator<ResourceEntity> iterator = page.iterator();

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/SpecialtyController.java

@@ -124,7 +124,7 @@ public class SpecialtyController extends ControllerSupport {
         };
 
         PageRequest pageRequest = PageRequest.of(curPage, pageSize,
-                new Sort(Direction.DESC, "updateTime", "id"));
+                Sort.by(Direction.DESC, "updateTime", "id"));
 
         Page<SpecialtyEntity> page = specialtyRepo.findAll(specification, pageRequest);
         return page;
@@ -178,7 +178,7 @@ public class SpecialtyController extends ControllerSupport {
         }
 
         List<SpecialtyEntity> list = specialtyRepo.findAll(specification,
-                new Sort(Direction.DESC, "updateTime"));
+                Sort.by(Direction.DESC, "updateTime"));
         return list;
     }
 

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/StudentController.java

@@ -129,7 +129,7 @@ public class StudentController extends ControllerSupport {
         final Long finalRootOrgId = rootOrgId;
 
         PageRequest pageable = PageRequest.of(curPage, pageSize,
-                new Sort(Direction.DESC, "updateTime", "id"));
+                Sort.by(Direction.DESC, "updateTime", "id"));
 
         UserDataRule userDataRule = super.getUserDataRule(DataRuleType.ORG);
         if (userDataRule.assertEmptyQueryResult()) {
@@ -386,7 +386,7 @@ public class StudentController extends ControllerSupport {
         }
 
         List<StudentEntity> studentList = studentRepo.findAll(specification,
-                new Sort(Direction.DESC, "updateTime"));
+                Sort.by(Direction.DESC, "updateTime"));
         this.doExport(studentList);
     }
 

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/SystemPropertyController.java

@@ -82,7 +82,7 @@ public class SystemPropertyController extends ControllerSupport {
         };
 
         PageRequest pageRequest = PageRequest.of(curPage, pageSize,
-                new Sort(Direction.DESC, "updateTime", "propKey"));
+                Sort.by(Direction.DESC, "updateTime", "propKey"));
 
         Page<SystemPropertyEntity> page = systemPropertyRepo.findAll(specification, pageRequest);
 

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/UserController.java

@@ -338,7 +338,7 @@ public class UserController 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<UserEntity> userList = userRepo.findAll(specification, pageRequest);
 

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/FaceServiceImpl.java

@@ -150,7 +150,7 @@ public class FaceServiceImpl implements FaceService {
 			return cb.and(predicates.toArray(new Predicate[predicates.size()]));
 		};
 
-		PageRequest pageRequest = PageRequest.of(0, 10, new Sort(Direction.DESC, "updateTime"));
+		PageRequest pageRequest = PageRequest.of(0, 10, Sort.by(Direction.DESC, "updateTime"));
 
 		Page<FacesetEntity> studentList = facesetRepo.findAll(specification, pageRequest);