wangliang 4 năm trước cách đây
mục cha
commit
d1e569f27b

+ 5 - 14
themis-exam/src/main/java/com/qmth/themis/exam/api/TIeInvigilateCallMobileController.java

@@ -172,12 +172,7 @@ public class TIeInvigilateCallMobileController {
         if (Objects.nonNull(ExamRecordCacheUtil.getMonitorLiveUrl(recordId, source.name()))) {
             liveUrl = ExamRecordCacheUtil.getMonitorLiveUrl(recordId, source.name());
         }
-        MonitorCallStatusSourceEnum callStatus = null;
-        if (Objects.nonNull(ExamRecordCacheUtil.getMonitorCallStatus(recordId, source.name()))) {
-            callStatus = ExamRecordCacheUtil.getMonitorCallStatus(recordId, source.name());
-        } else {
-            callStatus = MonitorCallStatusSourceEnum.STOP;
-        }
+        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);
@@ -224,16 +219,12 @@ 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()))) {
             throw new BusinessException("推流状态为空");
         }

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

@@ -200,9 +200,6 @@ public class TIeInvigilateCallOeController {
         if (Objects.nonNull(ExamRecordCacheUtil.getMonitorLiveUrlClientCamera(recordId))) {
             source = MonitorVideoSourceEnum.CLIENT_CAMERA;
             liveUrl = ExamRecordCacheUtil.getMonitorLiveUrlClientCamera(recordId);
-        } else if (Objects.nonNull(ExamRecordCacheUtil.getMonitorLiveUrlClientScreen(recordId))) {
-            source = MonitorVideoSourceEnum.CLIENT_SCREEN;
-            liveUrl = ExamRecordCacheUtil.getMonitorLiveUrlClientScreen(recordId);
         }
         if (Objects.isNull(source) || Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source.name()))) {
             throw new BusinessException("推流状态为空");