bug修改

themis-exam/src/main/java/com/qmth/themis/exam/api/TEStudentController.java

@@ -226,7 +226,6 @@ public class TEStudentController {
             //获取剩余断点次数
             Integer alreadyBreakCount = ExamRecordCacheUtil.getAlreadyBreakCount(recordId);
             Integer leftBreakResumeCount = ec.getBreakResumeCount() - alreadyBreakCount;
-            leftBreakResumeCount = leftBreakResumeCount <= 0 ? 0 : leftBreakResumeCount;
             //如果断点时间大于整体断点时间，则强制交卷
             if (Objects.equals(status, ExamRecordStatusEnum.ANSWERING) || Objects.equals(status, ExamRecordStatusEnum.BREAK_OFF) || Objects.equals(status, ExamRecordStatusEnum.RESUME_PREPARE)) {
                 if (Objects.nonNull(lastBreakTime) && (System.currentTimeMillis() - lastBreakTime.getTime()) / 1000 > breakExpireSeconds) {
@@ -236,8 +235,8 @@ public class TEStudentController {
                         map.put("waiting", list);
                     }
                 } else {
-                    //如果断点次数为0，也强制交卷
-                    if (leftBreakResumeCount <= 0) {
+                    //如果断点次数小于0，也强制交卷
+                    if (leftBreakResumeCount < 0) {
                         teExamService.finish(teStudentCacheDto.getId(), recordId, FinishTypeEnum.AUTO.name(), durationSeconds);
                         List<TEExamDto> list = teExamService.getWaitingExam(teStudent.getId(), examId, orgId);
                         if (Objects.nonNull(list) && list.size() > 0) {

themis-exam/src/main/java/com/qmth/themis/exam/websocket/WebSocketOeServer.java

@@ -186,8 +186,7 @@ public class WebSocketOeServer implements Concurrently {
                 Integer durationSeconds = Objects.isNull(ExamRecordCacheUtil.getDurationSeconds(recordId)) ? 0 : ExamRecordCacheUtil.getDurationSeconds(recordId);
                 Integer alreadyBreakCount = ExamRecordCacheUtil.getAlreadyBreakCount(recordId);
                 Integer leftBreakResumeCount = ec.getBreakResumeCount() - alreadyBreakCount;
-                leftBreakResumeCount = leftBreakResumeCount <= 0 ? 0 : leftBreakResumeCount;
-                if (leftBreakResumeCount <= 0) {
+                if (leftBreakResumeCount < 0) {
                     teExamService.finish(examStudentCacheBean.getStudentId(), recordId, FinishTypeEnum.AUTO.name(), durationSeconds);
                 } else {
                     alreadyBreakCount++;

themis-mq/src/main/java/com/qmth/themis/mq/service/impl/MqLogicServiceImpl.java

@@ -253,8 +253,7 @@ public class MqLogicServiceImpl implements MqLogicService {
                     //增加断点记录,获取剩余断点次数
                     Integer alreadyBreakCount = ExamRecordCacheUtil.getAlreadyBreakCount(recordId);
                     Integer leftBreakResumeCount = ec.getBreakResumeCount() - alreadyBreakCount;
-                    leftBreakResumeCount = leftBreakResumeCount <= 0 ? 0 : leftBreakResumeCount;
-                    if (leftBreakResumeCount <= 0) {
+                    if (leftBreakResumeCount < 0) {
                         Integer durationSeconds = Objects.isNull(ExamRecordCacheUtil.getDurationSeconds(recordId)) ? 0 : ExamRecordCacheUtil.getDurationSeconds(recordId);
                         teExamService.finish(examStudentCacheBean.getStudentId(), recordId, FinishTypeEnum.AUTO.name(), durationSeconds);
                     } else {