Merge branch 'dev'

1

themis-backend/src/main/resources/application.properties

@@ -22,9 +22,9 @@ redis.database=15
 redis.port=6379
 redis.password=
 #mongodb\u6570\u636E\u6E90\u914D\u7F6E
-mongodb.database=themis-backend
-mongodb.host=${db.host}
-mongodb.port=27017
+#mongodb.database=themis-backend
+#mongodb.host=${db.host}
+#mongodb.port=27017
 spring.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8
 spring.datasource.username=${db.username}
 spring.datasource.password=${db.password}
@@ -168,7 +168,7 @@ rocketmq.producer.secret-key=SK
 #\u542F\u7528\u6D88\u606F\u8F68\u8FF9\uFF0C\u9ED8\u8BA4\u503Ctrue
 rocketmq.producer.enable-msg-trace=true
 #\u81EA\u5B9A\u4E49\u7684\u6D88\u606F\u8F68\u8FF9\u4E3B\u9898
-rocketmq.producer.customized-trace-topic=my-trace-topic
+#rocketmq.producer.customized-trace-topic=my-trace-topic
 
 #api\u524D\u7F00
 prefix.url.admin=api/admin

themis-business/src/main/java/com/qmth/themis/business/cache/bean/ExamCacheBean.java

@@ -1,17 +1,11 @@
 package com.qmth.themis.business.cache.bean;
 
-import java.io.Serializable;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.themis.business.enums.EntryAuthenticationPolicyEnum;
-import com.qmth.themis.business.enums.ExamModeEnum;
-import com.qmth.themis.business.enums.InProcessLivenessJudgePolicyEnum;
-import com.qmth.themis.business.enums.InvigilateMonitorStatusEnum;
-import com.qmth.themis.business.enums.InvigilateVerifyEnum;
-import com.qmth.themis.business.enums.ObjectiveScorePolicyEnum;
-import com.qmth.themis.business.enums.RecordSelectStrategyEnum;
-import com.qmth.themis.business.enums.ScoreStatusEnum;
+import com.qmth.themis.business.enums.*;
+
+import java.io.Serializable;
+import java.util.Objects;
 
 public class ExamCacheBean implements Serializable {
 
@@ -463,7 +457,7 @@ public class ExamCacheBean implements Serializable {
     }
 
     public Integer getBreakResumeCount() {
-        return breakResumeCount;
+        return Objects.isNull(breakResumeCount) ? 0 : breakResumeCount;
     }
 
     public void setBreakResumeCount(Integer breakResumeCount) {

themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamServiceImpl.java

@@ -484,7 +484,7 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
             finish(examStudentCacheBean.getStudentId(), recordId, FinishTypeEnum.AUTO.name(), durationSeconds);
         } else {
             //如果断点次数小于0，也强制交卷
-            if (leftBreakResumeCount < 0) {
+            if (leftBreakResumeCount <= 0) {
                 finish(examStudentCacheBean.getStudentId(), recordId, FinishTypeEnum.AUTO.name(), durationSeconds);
             }
         }
@@ -802,7 +802,7 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
             finish(examStudentCacheBean.getStudentId(), recordId, FinishTypeEnum.AUTO.name(), durationSeconds);
         } else {
             //如果断点次数小于0，也强制交卷
-            if (leftBreakResumeCount < 0) {
+            if (leftBreakResumeCount <= 0) {
                 finish(examStudentCacheBean.getStudentId(), recordId, FinishTypeEnum.AUTO.name(), durationSeconds);
             }
         }

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

@@ -260,7 +260,7 @@ public class TEStudentController {
                     }
                 } else {
                     //如果断点次数小于0，也强制交卷
-                    if (leftBreakResumeCount < 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/config/ExamConstant.java

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

themis-exam/src/main/resources/application.properties

@@ -117,7 +117,7 @@ rocketmq.producer.secret-key=SK
 #\u542F\u7528\u6D88\u606F\u8F68\u8FF9\uFF0C\u9ED8\u8BA4\u503Ctrue
 rocketmq.producer.enable-msg-trace=true
 #\u81EA\u5B9A\u4E49\u7684\u6D88\u606F\u8F68\u8FF9\u4E3B\u9898
-rocketmq.producer.customized-trace-topic=my-trace-topic
+#rocketmq.producer.customized-trace-topic=my-trace-topic
 
 #\u963F\u91CC\u4E91OSS\u914D\u7F6E
 aliyun.oss.publicName=oss-cn-shenzhen.aliyuncs.com

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

@@ -255,7 +255,7 @@ public class MqLogicServiceImpl implements MqLogicService {
             //增加断点记录,获取剩余断点次数
             Integer alreadyBreakCount = Objects.isNull(ExamRecordCacheUtil.getAlreadyBreakCount(recordId)) ? 0 : ExamRecordCacheUtil.getAlreadyBreakCount(recordId);
             Integer leftBreakResumeCount = ec.getBreakResumeCount() - alreadyBreakCount;
-            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 {

themis-task/src/main/resources/application.properties

@@ -178,4 +178,4 @@ rocketmq.producer.secret-key=SK
 #\u542F\u7528\u6D88\u606F\u8F68\u8FF9\uFF0C\u9ED8\u8BA4\u503Ctrue
 rocketmq.producer.enable-msg-trace=true
 #\u81EA\u5B9A\u4E49\u7684\u6D88\u606F\u8F68\u8FF9\u4E3B\u9898
-rocketmq.producer.customized-trace-topic=my-trace-topic
+#rocketmq.producer.customized-trace-topic=my-trace-topic