fix bug

1

@@ -1,6 +0,0 @@
-Merge branch 'dev'
-1
-# 请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支
-# 合并到主题分支。
-#
-# 以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。

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

@@ -134,17 +134,13 @@ public class TIeInvigilateCallMobileController {
             throw new BusinessException(ExceptionResultEnum.RECORD_ID_IS_NULL);
         }
         Long recordId = Long.parseLong(String.valueOf(mapParameter.get("recordId")));
+        if (Objects.isNull(mapParameter.get("source")) || Objects.equals(mapParameter.get("source"), "")) {
+            throw new BusinessException("来源不能为空!");
+        }
+        MonitorVideoSourceEnum source = MonitorVideoSourceEnum.valueOf(String.valueOf(mapParameter.get("source")));
         //获取考试记录缓存
         String liveUrl = null;
-        MonitorVideoSourceEnum source = null;
-        if (Objects.nonNull(ExamRecordCacheUtil.getMonitorLiveUrlMobileFirst(recordId))) {
-            source = MonitorVideoSourceEnum.MOBILE_FIRST;
-            liveUrl = ExamRecordCacheUtil.getMonitorLiveUrlMobileFirst(recordId);
-        } else if (Objects.nonNull(ExamRecordCacheUtil.getMonitorLiveUrlMobileSecond(recordId))) {
-            source = MonitorVideoSourceEnum.MOBILE_SECOND;
-            liveUrl = ExamRecordCacheUtil.getMonitorLiveUrlMobileSecond(recordId);
-        }
-        if (Objects.isNull(source) || Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source.name()))) {
+        if (Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source.name()))) {
             throw new BusinessException("推流状态为空");
         }
         ExamRecordCacheUtil.setMonitorCallStatus(recordId, source.name(), MonitorCallStatusSourceEnum.STOP);

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

@@ -125,8 +125,8 @@ public class TIeInvigilateCallOeController {
         }
         //获取考试记录缓存
         String liveUrl = Objects.nonNull(ExamRecordCacheUtil.getMonitorLiveUrl(recordId, source.name())) ? ExamRecordCacheUtil.getMonitorLiveUrl(recordId, source.name()) : null;
-        MonitorCallStatusSourceEnum callStatus = Objects.nonNull(ExamRecordCacheUtil.getMonitorCallStatus(recordId, source.name())) ? ExamRecordCacheUtil.getMonitorCallStatus(recordId, source.name()) : MonitorCallStatusSourceEnum.STOP;
-        ExamRecordCacheUtil.setMonitorStatus(recordId, source.name(), status,true);
+        MonitorCallStatusSourceEnum callStatus = Objects.nonNull(ExamRecordCacheUtil.getMonitorCallStatus(recordId, source.name())) ? ExamRecordCacheUtil.getMonitorCallStatus(recordId, source.name()) : null;
+        ExamRecordCacheUtil.setMonitorStatus(recordId, source.name(), status, true);
         ExamRecordCacheUtil.setMonitorCallStatus(recordId, source.name(), callStatus);
         String monitorKey = ExamRecordCacheUtil.getMonitorKey(recordId);
         TIeExamInvigilateCallLog tIeExamInvigilateCallLog = new TIeExamInvigilateCallLog(recordId, source, liveUrl, MonitorStatusSourceEnum.START, monitorKey, callStatus);