wangliang пре 4 година
родитељ
комит
d244334d93
27 измењених фајлова са 88 додато и 153 уклоњено
  1. 13 13
      themis-business/src/main/java/com/qmth/themis/business/enums/DownloadFileEnum.java
  2. 2 2
      themis-business/src/main/java/com/qmth/themis/business/enums/EncryptModeEnum.java
  3. 4 4
      themis-business/src/main/java/com/qmth/themis/business/enums/EntryAuthenticationPolicyEnum.java
  4. 2 2
      themis-business/src/main/java/com/qmth/themis/business/enums/ExamModeEnum.java
  5. 6 6
      themis-business/src/main/java/com/qmth/themis/business/enums/ExamRecordStatusEnum.java
  6. 3 3
      themis-business/src/main/java/com/qmth/themis/business/enums/ExamTypeEnum.java
  7. 4 4
      themis-business/src/main/java/com/qmth/themis/business/enums/FinishTypeEnum.java
  8. 2 2
      themis-business/src/main/java/com/qmth/themis/business/enums/GenderEnum.java
  9. 3 3
      themis-business/src/main/java/com/qmth/themis/business/enums/InProcessLivenessJudgePolicyEnum.java
  10. 1 1
      themis-business/src/main/java/com/qmth/themis/business/enums/InvigilateNoticeEnum.java
  11. 2 2
      themis-business/src/main/java/com/qmth/themis/business/enums/MonitorStatusSourceEnum.java
  12. 2 2
      themis-business/src/main/java/com/qmth/themis/business/enums/ObjectiveScorePolicyEnum.java
  13. 2 2
      themis-business/src/main/java/com/qmth/themis/business/enums/RealnessEnum.java
  14. 3 3
      themis-business/src/main/java/com/qmth/themis/business/enums/RecordSelectStrategyEnum.java
  15. 2 2
      themis-business/src/main/java/com/qmth/themis/business/enums/ReviewResultEnum.java
  16. 3 3
      themis-business/src/main/java/com/qmth/themis/business/enums/ScoreStatusEnum.java
  17. 3 3
      themis-business/src/main/java/com/qmth/themis/business/enums/TaskStatusEnum.java
  18. 5 45
      themis-business/src/main/java/com/qmth/themis/business/enums/TaskTypeEnum.java
  19. 0 24
      themis-business/src/main/java/com/qmth/themis/business/enums/WebsocketTypeEnum.java
  20. 2 2
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamServiceImpl.java
  21. 3 3
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TOeExamRecordServiceImpl.java
  22. 2 2
      themis-business/src/main/java/com/qmth/themis/business/templete/TaskExportCommon.java
  23. 1 1
      themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamPaperImportTemplete.java
  24. 1 1
      themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamStudentImportTemplete.java
  25. 4 4
      themis-business/src/main/java/com/qmth/themis/business/templete/service/impl/TempleteLogicServiceImpl.java
  26. 11 12
      themis-business/src/main/resources/db/init.sql
  27. 2 2
      themis-mq/src/main/java/com/qmth/themis/mq/service/impl/MqLogicServiceImpl.java

+ 13 - 13
themis-business/src/main/java/com/qmth/themis/business/enums/DownloadFileEnum.java

@@ -13,17 +13,17 @@ public enum DownloadFileEnum {
     /**
      * 导入文件
      */
-    importFile(0),
+    IMPORTFILE(0),
 
     /**
      * 错误文件
      */
-    error(1),
+    ERROR(1),
 
     /**
      * result
      */
-    result(2);
+    RESULT(2);
 
     private int id;
 
@@ -42,12 +42,12 @@ public enum DownloadFileEnum {
      * @return
      */
     public static int convertToId(String value) {
-        if (Objects.equals(value.trim(), importFile.name())) {
-            return importFile.getId();
-        } else if (Objects.equals(value.trim(), error.name())) {
-            return error.getId();
+        if (Objects.equals(value.trim(), IMPORTFILE.name())) {
+            return IMPORTFILE.getId();
+        } else if (Objects.equals(value.trim(), ERROR.name())) {
+            return ERROR.getId();
         } else {
-            return result.getId();
+            return RESULT.getId();
         }
     }
 
@@ -58,12 +58,12 @@ public enum DownloadFileEnum {
      * @return
      */
     public static String convertToName(int value) {
-        if (value == importFile.getId()) {
-            return importFile.name();
-        } else if (value == error.getId()) {
-            return error.name();
+        if (value == IMPORTFILE.getId()) {
+            return IMPORTFILE.name();
+        } else if (value == ERROR.getId()) {
+            return ERROR.name();
         } else {
-            return result.name();
+            return RESULT.name();
         }
     }
 }

+ 2 - 2
themis-business/src/main/java/com/qmth/themis/business/enums/EncryptModeEnum.java

@@ -8,9 +8,9 @@ package com.qmth.themis.business.enums;
 * @Date: 2020/7/29 
 */ 
 public enum EncryptModeEnum {
-    auto("自动"),
+    AUTO("自动"),
 
-    hand("手动");
+    HAND("手动");
 
     private String code;
 

+ 4 - 4
themis-business/src/main/java/com/qmth/themis/business/enums/EntryAuthenticationPolicyEnum.java

@@ -9,13 +9,13 @@ package com.qmth.themis.business.enums;
 */ 
 public enum EntryAuthenticationPolicyEnum {
 
-    off("关闭"),
+    OFF("关闭"),
 
-    face_verify_optional("非强制人脸验证"),
+    FACE_VERIFY_OPTIONAL("非强制人脸验证"),
 
-    face_verify_force("强制人脸验证"),
+    FACE_VERIFY_FORCE("强制人脸验证"),
 
-    liveness("活体验证");
+    LIVENESS("活体验证");
 
     private EntryAuthenticationPolicyEnum(String code){
         this.code = code;

+ 2 - 2
themis-business/src/main/java/com/qmth/themis/business/enums/ExamModeEnum.java

@@ -12,12 +12,12 @@ public enum ExamModeEnum {
     /**
      * 集中统一
      */
-    together("集中统一"),
+    TOGETHER("集中统一"),
 
     /**
      * 随到随考
      */
-    anytime("随到随考");
+    ANYTIME("随到随考");
 
     private String code;
 

+ 6 - 6
themis-business/src/main/java/com/qmth/themis/business/enums/ExamRecordStatusEnum.java

@@ -9,17 +9,17 @@ package com.qmth.themis.business.enums;
 */
 public enum ExamRecordStatusEnum {
 
-    first_prepare("首次候考"),
+    FIRST_PREPARE("首次候考"),
 
-    answering("正在答题"),
+    ANSWERING("正在答题"),
 
-    break_off("已中断"),
+    bREAK_OFF("已中断"),
 
-    resume_prepare("断点恢复候考"),
+    RESUME_PREPARE("断点恢复候考"),
 
-    finished("已结束考试"),
+    FINISHED("已结束考试"),
 
-    persisted("数据已保存");
+    PERSISTED("数据已保存");
 
     private String code;
 

+ 3 - 3
themis-business/src/main/java/com/qmth/themis/business/enums/ExamTypeEnum.java

@@ -9,11 +9,11 @@ package com.qmth.themis.business.enums;
 */ 
 public enum ExamTypeEnum {
 
-    first("初次开考"),
+    FIRST("初次开考"),
 
-    recover("恢复开考"),
+    RECOVER("恢复开考"),
 
-    process("过程中");
+    PROCESS("过程中");
 
     private String code;
 

+ 4 - 4
themis-business/src/main/java/com/qmth/themis/business/enums/FinishTypeEnum.java

@@ -9,13 +9,13 @@ package com.qmth.themis.business.enums;
 */
 public enum FinishTypeEnum {
 
-    hand("手动"),
+    HAND("手动"),
 
-    auto("自动"),
+    AUTO("自动"),
 
-    breach("违纪交卷"),
+    BREACH("违纪交卷"),
 
-    interrupt("监考强制");
+    INTERRUPT("监考强制");
 
     private String code;
 

+ 2 - 2
themis-business/src/main/java/com/qmth/themis/business/enums/GenderEnum.java

@@ -9,9 +9,9 @@ package com.qmth.themis.business.enums;
  */
 public enum GenderEnum {
 
-    man("男"),
+    MAN("男"),
 
-    woman("女");
+    WOMAN("女");
 
     private GenderEnum(String code) {
         this.code = code;

+ 3 - 3
themis-business/src/main/java/com/qmth/themis/business/enums/InProcessLivenessJudgePolicyEnum.java

@@ -8,11 +8,11 @@ package com.qmth.themis.business.enums;
 * @Date: 2020/7/29
 */
 public enum InProcessLivenessJudgePolicyEnum {
-    any("任意一次通过"),
+    ANY("任意一次通过"),
 
-    all("全部都要通过"),
+    ALL("全部都要通过"),
 
-    more("通过次数大于失败次数");
+    MORE("通过次数大于失败次数");
 
     private String code;
 

+ 1 - 1
themis-business/src/main/java/com/qmth/themis/business/enums/InvigilateNoticeEnum.java

@@ -9,7 +9,7 @@ package com.qmth.themis.business.enums;
 */ 
 public enum InvigilateNoticeEnum {
 
-    warning("警告");
+    WARNING("警告");
 
     private String code;
 

+ 2 - 2
themis-business/src/main/java/com/qmth/themis/business/enums/MonitorStatusSourceEnum.java

@@ -8,9 +8,9 @@ package com.qmth.themis.business.enums;
 * @Date: 2020/7/29
 */
 public enum MonitorStatusSourceEnum {
-    stop("停止"),
+    STOP("停止"),
 
-    start("正常");
+    START("正常");
 
     private String code;
 

+ 2 - 2
themis-business/src/main/java/com/qmth/themis/business/enums/ObjectiveScorePolicyEnum.java

@@ -10,12 +10,12 @@ public enum ObjectiveScorePolicyEnum {
     /**
      * 全对给分
      */
-    equal("全对给分"),
+    EQUAL("全对给分"),
 
     /**
      * 漏选给一半分
      */
-    partial("漏选给一半分");
+    PARTIAL("漏选给一半分");
 
     private String title;
 

+ 2 - 2
themis-business/src/main/java/com/qmth/themis/business/enums/RealnessEnum.java

@@ -9,9 +9,9 @@ package com.qmth.themis.business.enums;
 */
 public enum RealnessEnum {
 
-    pass("通过"),
+    PASS("通过"),
 
-    no_pass("不通过");
+    NO_PASS("不通过");
 
     private String code;
 

+ 3 - 3
themis-business/src/main/java/com/qmth/themis/business/enums/RecordSelectStrategyEnum.java

@@ -8,11 +8,11 @@ package com.qmth.themis.business.enums;
 * @Date: 2020/7/29 
 */ 
 public enum RecordSelectStrategyEnum {
-    highest_total_score("全部阅卷后取最高分"),
+    HIGHEST_TOTAL_SCORE("全部阅卷后取最高分"),
 
-    highest_objective_score("客观分最高"),
+    HIGHEST_OBJECTIVE_SCORE("客观分最高"),
 
-    latest("最后一次提交");
+    LATEST("最后一次提交");
 
     private String code;
 

+ 2 - 2
themis-business/src/main/java/com/qmth/themis/business/enums/ReviewResultEnum.java

@@ -9,9 +9,9 @@ package com.qmth.themis.business.enums;
 */
 public enum ReviewResultEnum {
     //todo 数据模型待补充确认
-    pass("通过"),
+    PASS("通过"),
 
-    no_pass("不通过");
+    NO_PASS("不通过");
 
     private String code;
 

+ 3 - 3
themis-business/src/main/java/com/qmth/themis/business/enums/ScoreStatusEnum.java

@@ -8,11 +8,11 @@ package com.qmth.themis.business.enums;
 * @Date: 2020/7/29
 */
 public enum ScoreStatusEnum {
-    never("从未算分"),
+    NEVER("从未算分"),
 
-    calculating("正在算分"),
+    CALCULATING("正在算分"),
 
-    finish("算分完成");
+    FINISH("算分完成");
 
     private String code;
 

+ 3 - 3
themis-business/src/main/java/com/qmth/themis/business/enums/TaskStatusEnum.java

@@ -11,11 +11,11 @@ import java.util.Objects;
  */
 public enum TaskStatusEnum {
 
-    init("未开始"),
+    INIT("未开始"),
 
-    running("开始执行"),
+    RUNNING("开始执行"),
 
-    finish("执行结束");
+    FINISH("执行结束");
 
     private String code;
 

+ 5 - 45
themis-business/src/main/java/com/qmth/themis/business/enums/TaskTypeEnum.java

@@ -11,15 +11,15 @@ import java.util.Objects;
  */
 public enum TaskTypeEnum {
 
-    calculate_exam_score("考试重新算分"),
+    CALCULATE_EXAM_SCORE("考试重新算分"),
 
-    import_exam_student("导入考生"),
+    IMPORT_EXAM_STUDENT("导入考生"),
 
-    import_exam_paper("导入试卷"),
+    IMPORT_EXAM_PAPER("导入试卷"),
 
-    import_invigilate_user("导入监考员"),
+    IMPORT_INVIGILATE_USER("导入监考员"),
 
-    export_invigilate_user("导出监考员");
+    EXPORT_INVIGILATE_USER("导出监考员");
 
     private String code;
 
@@ -30,44 +30,4 @@ public enum TaskTypeEnum {
     public String getCode() {
         return code;
     }
-
-    /**
-     * 状态转换 toId
-     *
-     * @param value
-     * @return
-     */
-    public static String convertToCode(String value) {
-        if (Objects.equals(value.trim(), calculate_exam_score.name())) {
-            return calculate_exam_score.getCode();
-        } else if (Objects.equals(value.trim(), import_exam_student.name())) {
-            return import_exam_student.getCode();
-        } else if (Objects.equals(value.trim(), import_exam_paper.name())) {
-            return import_exam_paper.getCode();
-        } else if (Objects.equals(value.trim(), import_invigilate_user.name())) {
-            return import_invigilate_user.getCode();
-        } else {
-            return export_invigilate_user.getCode();
-        }
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param value
-     * @return
-     */
-    public static String convertToName(String value) {
-        if (Objects.equals(value.trim(), calculate_exam_score.getCode())) {
-            return calculate_exam_score.name();
-        } else if (Objects.equals(value.trim(), import_exam_student.getCode())) {
-            return import_exam_student.name();
-        } else if (Objects.equals(value.trim(), import_exam_paper.getCode())) {
-            return import_exam_paper.name();
-        } else if (Objects.equals(value.trim(), import_invigilate_user.getCode())) {
-            return import_invigilate_user.name();
-        } else {
-            return export_invigilate_user.name();
-        }
-    }
 }

+ 0 - 24
themis-business/src/main/java/com/qmth/themis/business/enums/WebsocketTypeEnum.java

@@ -33,30 +33,6 @@ public enum WebsocketTypeEnum {
         this.desc = desc;
     }
 
-    /**
-     * 状态转换 toDesc
-     *
-     * @param value
-     * @return
-     */
-    public static String convertToDesc(String value) {
-        if (Objects.equals(value.trim(), client_paper_download.name())) {
-            return client_paper_download.getDesc();
-        } else if (Objects.equals(value.trim(), sync_status.name())) {
-            return sync_status.getDesc();
-        } else if (Objects.equals(value.trim(), sync_ack.name())) {
-            return sync_ack.getDesc();
-        } else if (Objects.equals(value.trim(), invigilate_liveness_verify.name())) {
-            return invigilate_liveness_verify.getDesc();
-        } else if (Objects.equals(value.trim(), invigilate_notice.name())) {
-            return invigilate_notice.getDesc();
-        } else if (Objects.equals(value.trim(), invigilate_notice_ack.name())) {
-            return invigilate_notice_ack.getDesc();
-        } else {
-            return invigilate_stop_exam.getDesc();
-        }
-    }
-
     public String getCode() {
         return code;
     }

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

@@ -285,7 +285,7 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
 
 		// 更新考试记录缓存
 		ExamRecordCacheUtil.setFirstStartTime(recordId, new Date());
-		ExamRecordCacheUtil.setStatus(recordId, ExamRecordStatusEnum.first_prepare);
+		ExamRecordCacheUtil.setStatus(recordId, ExamRecordStatusEnum.FIRST_PREPARE);
 
 		return ret;
 	}
@@ -545,7 +545,7 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
 		ExamRecordCacheUtil.setFinishTime(recordId, now);
 		ExamRecordCacheUtil.setDurationSeconds(recordId, durationSeconds);
 		ExamRecordCacheUtil.setFinishType(recordId, FinishTypeEnum.valueOf(type.toLowerCase()));
-		ExamRecordCacheUtil.setStatus(recordId, ExamRecordStatusEnum.finished);
+		ExamRecordCacheUtil.setStatus(recordId, ExamRecordStatusEnum.FINISHED);
 		return ret;
 	}
 

+ 3 - 3
themis-business/src/main/java/com/qmth/themis/business/service/impl/TOeExamRecordServiceImpl.java

@@ -118,7 +118,7 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
 		er.setPaperId(paperId);
 		er.setSerialNumber(serialNumber);
 		er.setFirstPrepareTime(new Date());
-		er.setStatus(ExamRecordStatusEnum.first_prepare);
+		er.setStatus(ExamRecordStatusEnum.FIRST_PREPARE);
 		redisUtil.set(RedisKeyHelper.examRecordCacheKey(er.getId()), SimpleBeanUtil.objectToMap(er));
 		return er.getId();
 	}
@@ -161,14 +161,14 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
 		if (cb.getStructType().intValue() == 2) {
 			ExamCacheBean ec = examService.getExamCacheBean(ExamRecordCacheUtil.getExamId(recordId));
 			int r = checkMultipleChoice(answer.getContent(), cb.getChoiceAnswer());
-			if (ec.getObjectiveScorePolicy().equals(ObjectiveScorePolicyEnum.equal)) {// 全对给分
+			if (ec.getObjectiveScorePolicy().equals(ObjectiveScorePolicyEnum.EQUAL)) {// 全对给分
 				if (r == 1) {
 					answer.setScore(cb.getScore());
 				} else {
 					answer.setScore(0.0);
 				}
 			}
-			if (ec.getObjectiveScorePolicy().equals(ObjectiveScorePolicyEnum.partial)) {// 漏选半分
+			if (ec.getObjectiveScorePolicy().equals(ObjectiveScorePolicyEnum.PARTIAL)) {// 漏选半分
 				if (r == 1) {
 					answer.setScore(cb.getScore());
 				} else if (r == 0) {

+ 2 - 2
themis-business/src/main/java/com/qmth/themis/business/templete/TaskExportCommon.java

@@ -173,12 +173,12 @@ public class TaskExportCommon {
         BigDecimal bigDecimal = new BigDecimal(100);
         BigDecimal progress = new BigDecimal(Double.valueOf(new BigDecimal(max).divide(new BigDecimal(size), 2, BigDecimal.ROUND_HALF_UP).multiply(bigDecimal).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())).setScale(0, BigDecimal.ROUND_HALF_UP);
         if (progress.intValue() == 100) {
-            this.tbTaskHistory.setStatus(TaskStatusEnum.finish);
+            this.tbTaskHistory.setStatus(TaskStatusEnum.FINISH);
             this.tbTaskHistory.setSummary("共导出了" + size + "条数据");
             this.tbTaskHistory.setFinishTime(new Date());
             txtList.add(DateUtil.format(new Date(), this.timeFormat) + "->数据导出完毕," + this.tbTaskHistory.getSummary());
         } else {
-            this.tbTaskHistory.setStatus(TaskStatusEnum.running);
+            this.tbTaskHistory.setStatus(TaskStatusEnum.RUNNING);
             this.tbTaskHistory.setSummary("正在导出第" + min + "条至" + max + "条数据");
             txtList.add(DateUtil.format(new Date(), this.timeFormat) + "->数据导出中," + this.tbTaskHistory.getSummary());
         }

+ 1 - 1
themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamPaperImportTemplete.java

@@ -181,7 +181,7 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
             paper.setName(paperJson.getString("name"));
             paper.setTotalScore(paperJson.getDouble("totalScore"));
             paper.setDecryptSecret(RandomStringUtils.randomAlphanumeric(16));
-            paper.setEncryptMode(EncryptModeEnum.auto);
+            paper.setEncryptMode(EncryptModeEnum.AUTO);
             paper.setExamId(teExam.getId());
             paper.setCode(paperCode);
             paper.setHasAudio(paperJson.getInteger("hasAudio"));

+ 1 - 1
themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamStudentImportTemplete.java

@@ -71,7 +71,7 @@ public class TaskExamStudentImportTemplete implements TaskImportTemplete {
                             excelErrorList.addAll(excelErrorTemp);
                         }
                         //校验考试模式,如果是集中统一,则需填写考试场次
-                        if (Objects.equals(taskImportCommon.getMode(), ExamModeEnum.together.name()) && Objects.isNull(examStudentImportDto.getExamActivityCode())) {
+                        if (Objects.equals(taskImportCommon.getMode(), ExamModeEnum.TOGETHER.name()) && Objects.isNull(examStudentImportDto.getExamActivityCode())) {
                             excelErrorList.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[考场]为空"));
                         }
                     }

+ 4 - 4
themis-business/src/main/java/com/qmth/themis/business/templete/service/impl/TempleteLogicServiceImpl.java

@@ -280,12 +280,12 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
         BigDecimal bigDecimal = new BigDecimal(100);
         BigDecimal progress = new BigDecimal(Double.valueOf(new BigDecimal(max).divide(new BigDecimal(size), 2, BigDecimal.ROUND_HALF_UP).multiply(bigDecimal).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())).setScale(0, BigDecimal.ROUND_HALF_UP);
         if (progress.intValue() == 100) {
-            tbTaskHistory.setStatus(TaskStatusEnum.finish);
+            tbTaskHistory.setStatus(TaskStatusEnum.FINISH);
             tbTaskHistory.setSummary("共处理了" + size + "条数据");
             tbTaskHistory.setFinishTime(new Date());
             txtList.add(DateUtil.format(new Date(), timeFormat) + "->数据处理完毕," + tbTaskHistory.getSummary());
         } else {
-            tbTaskHistory.setStatus(TaskStatusEnum.running);
+            tbTaskHistory.setStatus(TaskStatusEnum.RUNNING);
             tbTaskHistory.setSummary("正在处理第" + min + "条至" + max + "条数据");
             txtList.add(DateUtil.format(new Date(), timeFormat) + "->数据处理中," + tbTaskHistory.getSummary());
         }
@@ -309,12 +309,12 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
         BigDecimal bigDecimal = new BigDecimal(100);
         BigDecimal progress = new BigDecimal(Double.valueOf(new BigDecimal(max).divide(new BigDecimal(size), 2, BigDecimal.ROUND_HALF_UP).multiply(bigDecimal).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())).setScale(0, BigDecimal.ROUND_HALF_UP);
         if (progress.intValue() == 100) {
-            tbTaskHistory.setStatus(TaskStatusEnum.finish);
+            tbTaskHistory.setStatus(TaskStatusEnum.FINISH);
             tbTaskHistory.setSummary("共导出了" + size + "条数据");
             tbTaskHistory.setFinishTime(new Date());
             txtList.add(DateUtil.format(new Date(), timeFormat) + "->数据导出完毕," + tbTaskHistory.getSummary());
         } else {
-            tbTaskHistory.setStatus(TaskStatusEnum.running);
+            tbTaskHistory.setStatus(TaskStatusEnum.RUNNING);
             tbTaskHistory.setSummary("正在导出第" + min + "条至" + max + "条数据");
             txtList.add(DateUtil.format(new Date(), timeFormat) + "->数据导出中," + tbTaskHistory.getSummary());
         }

+ 11 - 12
themis-business/src/main/resources/db/init.sql

@@ -11,7 +11,7 @@
  Target Server Version : 80020
  File Encoding         : 65001
 
- Date: 30/07/2020 14:38:04
+ Date: 01/08/2020 11:48:00
 */
 
 SET NAMES utf8mb4;
@@ -630,8 +630,8 @@ CREATE TABLE `t_e_exam` (
 -- Records of t_e_exam
 -- ----------------------------
 BEGIN;
-INSERT INTO `t_e_exam` VALUES (18738036992901120, 1, '202007130001', '20200713test1', '20200713001', '2020-07-27 00:00:00', '2020-07-29 00:00:00', '456321', 10, 5, '我是考前须知1', 10, '我是考后说明1', 3, 60, 5, 1, 1, 1, 1, 1, 1, 1, 1, '2020-07-22 16:58:17', '2020-07-22 16:58:17', 'together', 1, NULL, 10, 120, 1, 'liveness', 1, 0, 1, '10', 3, 'all', 'highest_objective_score', 1, '192.168.10.2,192.168.10.3', 'never', 1, NULL, 1, 1, 'equal', NULL, NULL);
-INSERT INTO `t_e_exam` VALUES (18738491387019264, 1, '202007130002', '20200713test2', '20200713002', '2020-07-27 00:00:00', '2020-07-29 00:00:00', '4563210', 10, 5, '我是考前须知2', 10, '我是考后说明2', 3, 60, 5, 1, 1, 1, 1, 1, 1, 1, 1, '2020-07-22 17:00:05', '2020-07-22 17:00:05', 'anytime', 1, NULL, 10, 120, 1, 'liveness', 1, 0, 1, '10', 3, 'all', 'highest_objective_score', 1, '192.168.10.2,192.168.10.3', 'never', 1, NULL, 1, 1, 'equal', NULL, NULL);
+INSERT INTO `t_e_exam` VALUES (18738036992901120, 1, '202007130001', '20200713test1', '20200713001', '2020-07-27 00:00:00', '2020-07-29 00:00:00', '456321', 10, 5, '我是考前须知1', 10, '我是考后说明1', 3, 60, 5, 1, 1, 1, 1, 1, 1, 1, 1, '2020-07-22 16:58:17', '2020-07-22 16:58:17', 'TOGETHER', 1, NULL, 10, 120, 1, 'LIVENESS', 1, 0, 1, '10', 3, 'ALL', 'HIGHEST_OBJECTIVE_SCORE', 1, '192.168.10.2,192.168.10.3', 'NEVER', 1, NULL, 1, 1, 'EQUAL', NULL, NULL);
+INSERT INTO `t_e_exam` VALUES (18738491387019264, 1, '202007130002', '20200713test2', '20200713002', '2020-07-27 00:00:00', '2020-07-29 00:00:00', '4563210', 10, 5, '我是考前须知2', 10, '我是考后说明2', 3, 60, 5, 1, 1, 1, 1, 1, 1, 1, 1, '2020-07-22 17:00:05', '2020-07-22 17:00:05', 'ANYTIME', 1, NULL, 10, 120, 1, 'LIVENESS', 1, 0, 1, '10', 3, 'ALL', 'HIGHEST_OBJECTIVE_SCORE', 1, '192.168.10.2,192.168.10.3', 'NEVER', 1, NULL, 1, 1, 'EQUAL', NULL, NULL);
 COMMIT;
 
 -- ----------------------------
@@ -747,12 +747,12 @@ CREATE TABLE `t_e_exam_paper` (
 -- Records of t_e_exam_paper
 -- ----------------------------
 BEGIN;
-INSERT INTO `t_e_exam_paper` VALUES (1, '大学语文2020测试卷A', 100, 'http://111', '123456', 'hand', 1, '2020-07-22 17:06:07', NULL, 18738036992901120, 'YWP001', 'http://222', 1, 100, 3, 1, NULL, 'YW001', 'http://333', '123456789');
-INSERT INTO `t_e_exam_paper` VALUES (2, '大学英语2020测试卷A', 120, 'http://111', '123456', 'hand', 1, '2020-07-22 17:06:07', NULL, 18738036992901120, 'YYP001', 'http://222', 1, 90, 3, 1, NULL, 'YY001', 'http://333', '123456789');
-INSERT INTO `t_e_exam_paper` VALUES (3, '大学语文2020测试卷B', 100, 'http://111', '123456', 'auto', 1, '2020-07-22 17:06:07', NULL, 18738036992901120, 'YWP002', 'http://222', 1, 90, 3, 1, NULL, 'YW001', 'http://333', '123456789');
-INSERT INTO `t_e_exam_paper` VALUES (4, '大学英语2020测试卷B', 120, 'http://111', '123456', 'hand', 1, '2020-07-22 17:06:07', NULL, 18738036992901120, 'YYP002', 'http://222', 1, 100, 3, 1, NULL, 'YY001', 'http://333', '123456789');
-INSERT INTO `t_e_exam_paper` VALUES (5, '大学语文2020随到随考卷', 100, 'http://111', '123456', 'auto', 1, '2020-07-22 17:06:07', NULL, 18738491387019264, 'YWP003', 'http://222', 1, 100, 3, 1, NULL, 'YW002', 'http://333', '123456789');
-INSERT INTO `t_e_exam_paper` VALUES (6, '大学英语2020随到随考卷', 100, 'http://111', '123456', 'hand', 1, '2020-07-22 17:06:07', NULL, 18738491387019264, 'YYP003', 'http://222', 1, 100, 3, 1, NULL, 'YY002', 'http://333', '123456789');
+INSERT INTO `t_e_exam_paper` VALUES (1, '大学语文2020测试卷A', 100, 'http://111', '123456', 'HAND', 1, '2020-07-22 17:06:07', NULL, 18738036992901120, 'YWP001', 'http://222', 1, 100, 3, 1, NULL, 'YW001', 'http://333', '123456789');
+INSERT INTO `t_e_exam_paper` VALUES (2, '大学英语2020测试卷A', 120, 'http://111', '123456', 'HAND', 1, '2020-07-22 17:06:07', NULL, 18738036992901120, 'YYP001', 'http://222', 1, 90, 3, 1, NULL, 'YY001', 'http://333', '123456789');
+INSERT INTO `t_e_exam_paper` VALUES (3, '大学语文2020测试卷B', 100, 'http://111', '123456', 'AUTO', 1, '2020-07-22 17:06:07', NULL, 18738036992901120, 'YWP002', 'http://222', 1, 90, 3, 1, NULL, 'YW001', 'http://333', '123456789');
+INSERT INTO `t_e_exam_paper` VALUES (4, '大学英语2020测试卷B', 120, 'http://111', '123456', 'HAND', 1, '2020-07-22 17:06:07', NULL, 18738036992901120, 'YYP002', 'http://222', 1, 100, 3, 1, NULL, 'YY001', 'http://333', '123456789');
+INSERT INTO `t_e_exam_paper` VALUES (5, '大学语文2020随到随考卷', 100, 'http://111', '123456', 'AUTO', 1, '2020-07-22 17:06:07', NULL, 18738491387019264, 'YWP003', 'http://222', 1, 100, 3, 1, NULL, 'YW002', 'http://333', '123456789');
+INSERT INTO `t_e_exam_paper` VALUES (6, '大学英语2020随到随考卷', 100, 'http://111', '123456', 'HAND', 1, '2020-07-22 17:06:07', NULL, 18738491387019264, 'YYP003', 'http://222', 1, 100, 3, 1, NULL, 'YY002', 'http://333', '123456789');
 COMMIT;
 
 -- ----------------------------
@@ -1143,7 +1143,7 @@ CREATE TABLE `t_oe_exam_record` (
 -- Records of t_oe_exam_record
 -- ----------------------------
 BEGIN;
-INSERT INTO `t_oe_exam_record` VALUES (1, 18738036992901120, 18740006977798144, 1, 1, 'http://111', 'finished', '2020-07-22 17:34:02', '2020-07-22 17:34:02', '2020-07-25 23:15:51', NULL, NULL, 0, '', 1, '1234567891', '2020-07-25 23:10:11', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 100, 100, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, 19920220273508352, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_oe_exam_record` VALUES (1, 18738036992901120, 18740006977798144, 1, 1, 'http://111', 'ANSWERING', '2020-07-22 17:34:02', '2020-07-22 17:34:02', '2020-07-25 23:15:51', NULL, NULL, 0, '', 1, '1234567891', '2020-07-25 23:10:11', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 100, 100, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, 19920220273508352, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 COMMIT;
 
 -- ----------------------------
@@ -1173,7 +1173,6 @@ CREATE TABLE `t_oe_face_verify_history` (
   `type` varchar(30) DEFAULT NULL COMMENT 'first:初次开考,recover:恢复开考,process:过程中',
   `exception` varchar(30) DEFAULT NULL COMMENT '异常类型',
   `photo_url` varchar(100) DEFAULT NULL COMMENT '图片保存路径',
-  `time` bigint DEFAULT NULL COMMENT '验证时间戳',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='人脸验证记录';
 
@@ -1210,4 +1209,4 @@ CREATE TABLE `t_oe_simulate_paper` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='模拟试卷';
 
-SET FOREIGN_KEY_CHECKS = 1;
+SET FOREIGN_KEY_CHECKS = 1;

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

@@ -201,7 +201,7 @@ public class MqLogicServiceImpl implements MqLogicService {
             Integer breakCount = tOeExamRecord.getLeftBreakResumeCount();
             if (Objects.isNull(breakCount) || breakCount <= 0) {
                 //todo 没有断点次数,则强制交卷
-                tOeExamRecord.setStatus(ExamRecordStatusEnum.finished);
+                tOeExamRecord.setStatus(ExamRecordStatusEnum.FINISHED);
                 tOeExamRecordService.updateById(tOeExamRecord);
             } else {
                 breakCount--;
@@ -216,7 +216,7 @@ public class MqLogicServiceImpl implements MqLogicService {
                 tOeExamRecord.setLastBreakId(tOeExamBreakHistory.getId());
                 tOeExamRecord.setLastBreakTime(tOeExamBreakHistory.getBreakTime());
                 tOeExamRecord.setLeftBreakResumeCount(breakCount);
-                tOeExamRecord.setStatus(ExamRecordStatusEnum.break_off);
+                tOeExamRecord.setStatus(ExamRecordStatusEnum.bREAK_OFF);
                 tOeExamRecordService.updateById(tOeExamRecord);
             }
         }