Merge branch 'dev' into release

commit by wangliang

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

@@ -66,9 +66,6 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
     @Resource
     TOeExamAnswerService examAnswerService;
 
-    @Resource
-    TEExamStudentService examStudentService;
-
     @Resource
     TEExamActivityService examActivityService;
 

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

@@ -128,15 +128,15 @@ public class TEExamController {
                 Long breakId = ExamRecordCacheUtil.getLastBreakId(param.getRecordId());
                 if (Objects.nonNull(breakId)) {
                     JSONObject jsonObject = JSONObject.parseObject(param.getReason());
-                    ExceptionEnum exceptionEnum = ExceptionEnum.valueOf(ExceptionEnum.convertToName(String.valueOf(jsonObject.getJSONObject("reason").get("type"))));
-                    String reason = String.valueOf(jsonObject.getJSONObject("reason").get("reason"));
+                    ExceptionEnum exceptionEnum = ExceptionEnum.valueOf(ExceptionEnum.convertToName(String.valueOf(jsonObject.get("type"))));
+                    String reason = String.valueOf(jsonObject.get("reason"));
                     ExamBreakCacheUtil.setBreakReason(breakId, exceptionEnum);
                     ExamBreakCacheUtil.setResumeReason(breakId, reason);
+                    //考试断点异常原因 发送mq start
+                    MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXCEPTION_LOG.name(), JacksonUtil.parseJson(param), MqTagEnum.EXCEPTION_LOG, String.valueOf(param.getRecordId()), param.getReason());
+                    mqDtoService.assembleSendOneWayMsg(mqDto);
+                    //考试断点异常原因 发送mq end
                 }
-                //考试断点异常原因 发送mq start
-                MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXCEPTION_LOG.name(), JacksonUtil.parseJson(param), MqTagEnum.EXCEPTION_LOG, String.valueOf(param.getRecordId()), param.getReason());
-                mqDtoService.assembleSendOneWayMsg(mqDto);
-                //考试断点异常原因 发送mq end
             } else {
                 //mq发送消息start
                 MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.STUDENT.name(), SystemOperationEnum.ANSWERING, MqTagEnum.STUDENT, String.valueOf(teStudent.getId()), teStudent.getIdentity());