fix dependency

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

@@ -51,6 +51,7 @@ import cn.com.qmth.examcloud.task.api.DataSyncCloudService;
 import cn.com.qmth.examcloud.task.api.request.SyncExamReq;
 import cn.com.qmth.examcloud.web.config.SystemProperties;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
+import cn.com.qmth.examcloud.web.jpa.PageUtils;
 import cn.com.qmth.examcloud.web.redis.RedisClient;
 import cn.com.qmth.examcloud.web.security.DataRule;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
@@ -241,7 +242,7 @@ public class ExamController extends ControllerSupport {
 
         UserDataRule userDataRule = super.getUserDataRule(DataRuleType.EXAM);
         if (userDataRule.assertEmptyQueryResult()) {
-            return new PageInfo<>(new PageImpl<>(new ArrayList<>(), pageable, 0L));
+            return PageUtils.toPageInfo(new PageImpl<>(new ArrayList<>(), pageable, 0L));
         }
 
         Specification<ExamEntity> specification = (root, query, cb) -> {
@@ -313,7 +314,7 @@ public class ExamController extends ControllerSupport {
             bean.setIpLimitSettingsEnabled(StringUtil.isTrue(ipLimitValue));
         }
 
-        return new PageInfo<>(page, list);
+        return PageUtils.toPageInfo(page, list);
     }
 
     /**

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

@@ -26,6 +26,7 @@ import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.ExamSettingsCacheBean;
 import cn.com.qmth.examcloud.web.config.SystemProperties;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
+import cn.com.qmth.examcloud.web.jpa.PageUtils;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import com.google.common.collect.Lists;
 import io.swagger.annotations.Api;
@@ -158,7 +159,7 @@ public class ExamStageController extends ControllerSupport {
 
         }
 
-        PageInfo<ExamStageDomain> ret = new PageInfo<>(page, list);
+        PageInfo<ExamStageDomain> ret = PageUtils.toPageInfo(page, list);
         return ret;
     }
 

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

@@ -38,6 +38,7 @@ import cn.com.qmth.examcloud.reports.commons.enums.OperateContent;
 import cn.com.qmth.examcloud.reports.commons.util.ReportsUtil;
 import cn.com.qmth.examcloud.support.helper.IdentityNumberHelper;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
+import cn.com.qmth.examcloud.web.jpa.PageUtils;
 import cn.com.qmth.examcloud.web.security.DataRule;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import com.google.common.collect.Lists;
@@ -187,7 +188,7 @@ public class ExamStudentController extends ControllerSupport {
         UserDataRule courseDataRule = super.getUserDataRule(DataRuleType.COURSE);
         if (!skipRule) {
             if (orgDataRule.assertEmptyQueryResult() || courseDataRule.assertEmptyQueryResult()) {
-                return new PageInfo(Page.empty());
+                return PageUtils.toPageInfo(Page.empty());
             }
         }
 
@@ -271,7 +272,7 @@ public class ExamStudentController extends ControllerSupport {
         Page<ExamStudentEntity> page = examStudentRepo.findAll(specification, pageable);
 
         if (!page.hasContent()) {
-            return new PageInfo(Page.empty());
+            return PageUtils.toPageInfo(Page.empty());
         }
 
         Set<Long> orgIds = new HashSet<>(), examIds = new HashSet<>(), examStageIds = new HashSet<>(), studentIds = new HashSet<>();
@@ -374,7 +375,7 @@ public class ExamStudentController extends ControllerSupport {
             examStudents.add(bean);
         }
 
-        return new PageInfo<>(page, examStudents);
+        return PageUtils.toPageInfo(page, examStudents);
     }
 
     /**

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

@@ -39,6 +39,7 @@ import cn.com.qmth.examcloud.task.api.DataSyncCloudService;
 import cn.com.qmth.examcloud.task.api.request.SyncExamReq;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import cn.com.qmth.examcloud.web.helpers.SequenceLockHelper;
+import cn.com.qmth.examcloud.web.jpa.PageUtils;
 import cn.com.qmth.examcloud.web.redis.RedisClient;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -846,7 +847,7 @@ public class ExamServiceImpl implements ExamService {
         Specification<ExamIpLimitEntity> spec = getSpec(examId, limitType, ip);
 
         PageRequest pageRequest = PageRequest.of(curPage, pageSize, Sort.by(Sort.Direction.DESC, "creationTime"));
-        PageInfo<ExamIpLimitEntity> pages = new PageInfo<>(examIpLimitRepo.findAll(spec, pageRequest));
+        PageInfo<ExamIpLimitEntity> pages = PageUtils.toPageInfo(examIpLimitRepo.findAll(spec, pageRequest));
 
         PageInfo<ExamIpLimitInfo> pageInfo = new PageInfo<>();
         List<ExamIpLimitInfo> list = new ArrayList<>();

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

@@ -22,6 +22,7 @@ import cn.com.qmth.examcloud.marking.api.response.GetMarkWorkMainByIdsResp;
 import cn.com.qmth.examcloud.marking.api.response.GetMarkersByWorkIdsResp;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
+import cn.com.qmth.examcloud.web.jpa.PageUtils;
 import com.mysql.cj.util.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -159,7 +160,7 @@ public class NoticeServiceImpl implements NoticeService {
             ni.setRuleType(ruleType);
             resultList.add(ni);
         }
-        return new PageInfo<>(pagedNoticeEntityList, resultList);
+        return PageUtils.toPageInfo(pagedNoticeEntityList, resultList);
 
     }