wangliang 4 жил өмнө
parent
commit
7cd99c892b

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

@@ -8,7 +8,6 @@ import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.base.BasePage;
 import com.qmth.themis.business.bean.mobile.MobileAuthorizationMonitorBean;
 import com.qmth.themis.business.cache.ExamRecordCacheUtil;
-import com.qmth.themis.business.cache.RedisKeyHelper;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.AuthDto;
 import com.qmth.themis.business.dto.MqDto;
@@ -138,7 +137,7 @@ public class TIeInvigilateCallMobileController {
             source = MonitorVideoSourceEnum.MOBILE_SECOND;
             liveUrl = ExamRecordCacheUtil.getMonitorLiveUrlMobileSecond(recordId);
         }
-        if (Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source.name()))) {
+        if (Objects.isNull(source) || Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source.name()))) {
             throw new BusinessException("推流状态为空");
         }
         ExamRecordCacheUtil.setMonitorCallStatus(recordId, source.name(), MonitorCallStatusSourceEnum.STOP);

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

@@ -124,7 +124,7 @@ public class TIeInvigilateCallMobileController {
             source = MonitorVideoSourceEnum.MOBILE_SECOND;
             liveUrl = ExamRecordCacheUtil.getMonitorLiveUrlMobileSecond(recordId);
         }
-        if (Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source.name()))) {
+        if (Objects.isNull(source) || Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source.name()))) {
             throw new BusinessException("推流状态为空");
         }
         MonitorStatusSourceEnum status = ExamRecordCacheUtil.getMonitorStatus(recordId, source.name());
@@ -238,7 +238,7 @@ public class TIeInvigilateCallMobileController {
             source = MonitorVideoSourceEnum.MOBILE_SECOND;
             liveUrl = ExamRecordCacheUtil.getMonitorLiveUrlMobileSecond(recordId);
         }
-        if (Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source.name()))) {
+        if (Objects.isNull(source) || Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source.name()))) {
             throw new BusinessException("推流状态为空");
         }
         ExamRecordCacheUtil.setMonitorCallStatus(recordId, source.name(), MonitorCallStatusSourceEnum.STOP);

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

@@ -3,8 +3,6 @@ package com.qmth.themis.exam.api;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.cache.ExamRecordCacheUtil;
-import com.qmth.themis.business.cache.RedisKeyHelper;
-import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.business.entity.TIeExamInvigilateCallLog;
 import com.qmth.themis.business.enums.*;
@@ -164,7 +162,7 @@ public class TIeInvigilateCallOeController {
             source = MonitorVideoSourceEnum.CLIENT_SCREEN;
             liveUrl = ExamRecordCacheUtil.getMonitorLiveUrlClientScreen(recordId);
         }
-        if (Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source.name()))) {
+        if (Objects.isNull(source) || Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source.name()))) {
             throw new BusinessException("推流状态为空");
         }
         MonitorStatusSourceEnum status = ExamRecordCacheUtil.getMonitorStatus(recordId, source.name());
@@ -203,7 +201,7 @@ public class TIeInvigilateCallOeController {
             source = MonitorVideoSourceEnum.CLIENT_SCREEN;
             liveUrl = ExamRecordCacheUtil.getMonitorLiveUrlClientScreen(recordId);
         }
-        if (Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source.name()))) {
+        if (Objects.isNull(source) || Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source.name()))) {
             throw new BusinessException("推流状态为空");
         }
         MonitorStatusSourceEnum status = ExamRecordCacheUtil.getMonitorStatus(recordId, source.name());