Merge remote-tracking branch 'origin/dev' into dev

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

@@ -281,12 +281,12 @@ public class MqLogicServiceImpl implements MqLogicService {
             //更新客户端摄像头推流状态为stop
             MonitorStatusSourceEnum cameraStatusSourceEnum = ExamRecordCacheUtil.getMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_CAMERA.name());
             if (Objects.nonNull(cameraStatusSourceEnum)) {
-                ExamRecordCacheUtil.setMonitorStatus(recordId, cameraStatusSourceEnum.name(), MonitorStatusSourceEnum.STOP, true);
+                ExamRecordCacheUtil.setMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_CAMERA.name(), MonitorStatusSourceEnum.STOP, true);
             }
             //更新客户端屏幕推流状态为stop
             MonitorStatusSourceEnum screenStatusSourceEnum = ExamRecordCacheUtil.getMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_SCREEN.name());
             if (Objects.nonNull(screenStatusSourceEnum)) {
-                ExamRecordCacheUtil.setMonitorStatus(recordId, screenStatusSourceEnum.name(), MonitorStatusSourceEnum.STOP, true);
+                ExamRecordCacheUtil.setMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_SCREEN.name(), MonitorStatusSourceEnum.STOP, true);
             }
             //发送移动端监考退出考试mq消息 start
             MqDto mqDtoExamStop = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_STOP.name(), recordId, MqTagEnum.EXAM_STOP, String.valueOf(recordId), String.valueOf(recordId));
@@ -804,12 +804,12 @@ public class MqLogicServiceImpl implements MqLogicService {
         //更新客户端摄像头推流状态为stop
         MonitorStatusSourceEnum cameraStatusSourceEnum = ExamRecordCacheUtil.getMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_CAMERA.name());
         if (Objects.nonNull(cameraStatusSourceEnum)) {
-            ExamRecordCacheUtil.setMonitorStatus(recordId, cameraStatusSourceEnum.name(), MonitorStatusSourceEnum.STOP, true);
+            ExamRecordCacheUtil.setMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_CAMERA.name(), MonitorStatusSourceEnum.STOP, true);
         }
         //更新客户端屏幕推流状态为stop
         MonitorStatusSourceEnum screenStatusSourceEnum = ExamRecordCacheUtil.getMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_SCREEN.name());
         if (Objects.nonNull(screenStatusSourceEnum)) {
-            ExamRecordCacheUtil.setMonitorStatus(recordId, screenStatusSourceEnum.name(), MonitorStatusSourceEnum.STOP, true);
+            ExamRecordCacheUtil.setMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_SCREEN.name(), MonitorStatusSourceEnum.STOP, true);
         }
         //发送移动端监考退出考试mq消息 start
         MqDto mqDtoExamStop = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_STOP.name(), recordId, MqTagEnum.EXAM_STOP, String.valueOf(recordId), String.valueOf(recordId));