Merge branch 'dev'

123

themis-backend/src/main/java/com/qmth/themis/backend/api/TIeInvigilateController.java

@@ -205,7 +205,7 @@ public class TIeInvigilateController {
         teExamStudentLogQueryWrapper.lambda().eq(TEExamStudentLog::getExamRecordId,examRecordId)
                 .eq(TEExamStudentLog::getExamStudentId,examStudentId);
         List<TEExamStudentLog> teExamStudentLogList = teExamStudentLogService.list(teExamStudentLogQueryWrapper);
-        invigilateListDetailBean.setTeExamStudentLogList(teExamStudentLogList);
+        invigilateListDetailBean.setExamStudentLogList(teExamStudentLogList);
 
         //预警、异常、人脸
         //预警

themis-business/src/main/java/com/qmth/themis/business/bean/backend/InvigilateListDetailBean.java

@@ -74,14 +74,14 @@ public class InvigilateListDetailBean implements Serializable {
     private Integer breachStatus;
 
     @ApiModelProperty(name = "考生轨迹")
-    private List<TEExamStudentLog> teExamStudentLogList;
+    private List<TEExamStudentLog> examStudentLogList;
 
-    public List<TEExamStudentLog> getTeExamStudentLogList() {
-        return teExamStudentLogList;
+    public List<TEExamStudentLog> getExamStudentLogList() {
+        return examStudentLogList;
     }
 
-    public void setTeExamStudentLogList(List<TEExamStudentLog> teExamStudentLogList) {
-        this.teExamStudentLogList = teExamStudentLogList;
+    public void setExamStudentLogList(List<TEExamStudentLog> examStudentLogList) {
+        this.examStudentLogList = examStudentLogList;
     }
 
     public InvigilateListDetailBean(String examName, String examActivityCode, Long examId, Long examActivityId, Long examStudentId, Long examRecordId, String identity, String examStudentName, String courseNameCode, ExamRecordStatusEnum statusCode, String roomCode, String roomName, Integer breachStatus) {

themis-business/src/main/java/com/qmth/themis/business/enums/SystemOperationEnum.java

@@ -13,15 +13,17 @@ public enum SystemOperationEnum {
 
     LOGOUT("注销"),
 
-    PREPARE("进入候考"),
+    FIRST_PREPARE("首次候考"),
 
-    ANSWERING("进入考试"),
+    ANSWERING("正在答题"),
 
-    BREAK_OFF("断点"),
+    BREAK_OFF("已中断"),
 
     RESUME_PREPARE("断点恢复候考"),
 
-    FINISHED("交卷");
+    FINISHED("交卷"),
+
+    PERSISTED("数据已保存");
 
     private String code;
 

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

@@ -291,8 +291,8 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
         teStudentCacheDto.setUnFinishedRecordId(recordId);
         redisUtil.setStudent(studentId, teStudentCacheDto);
         //mq发送消息start
-        MqDto mqDto = new MqDto(MqTopicEnum.themisTopic.getCode(), MqTagEnum.STUDENT.name(), SystemOperationEnum.PREPARE, MqTagEnum.STUDENT, String.valueOf(teStudentCacheDto.getId()), teStudentCacheDto.getIdentity());
-        this.sendOeLogMessage(SystemOperationEnum.PREPARE, examStudentId, recordId, mqDto);
+        MqDto mqDto = new MqDto(MqTopicEnum.themisTopic.getCode(), MqTagEnum.STUDENT.name(), SystemOperationEnum.FIRST_PREPARE, MqTagEnum.STUDENT, String.valueOf(teStudentCacheDto.getId()), teStudentCacheDto.getIdentity());
+        this.sendOeLogMessage(SystemOperationEnum.FIRST_PREPARE, examStudentId, recordId, mqDto);
         updateExamStudent(examStudentId, alreadyExamCount, recordId);
         //mq发送消息end
         return prepare;