Merge branch 'dev'

1

1

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

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

@@ -129,22 +129,19 @@ public class TIeInvigilateCallMobileController {
     @Transactional
     public Result callCancel(@ApiJsonObject(name = "callCancelBackendMobile", value = {
             @ApiJsonProperty(key = "recordId", type = "long", example = "1", description = "考试记录id", required = true),
+            @ApiJsonProperty(key = "source", description = "监考视频源", required = true)
     }) @ApiParam(value = "监控信息", required = true) @RequestBody Map<String, Object> mapParameter) {
         if (Objects.isNull(mapParameter.get("recordId")) || Objects.equals(mapParameter.get("recordId"), "")) {
             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/TIeInvigilateCallMobileController.java

@@ -105,21 +105,18 @@ public class TIeInvigilateCallMobileController {
     @Transactional
     public Result callApply(@ApiJsonObject(name = "callApplyMobile", value = {
             @ApiJsonProperty(key = "recordId", type = "long", example = "1", description = "考试记录id", required = true),
+            @ApiJsonProperty(key = "source", description = "监考视频源", required = true)
     }) @ApiParam(value = "监控信息", required = true) @RequestBody Map<String, Object> mapParameter) {
         if (Objects.isNull(mapParameter.get("recordId")) || Objects.equals(mapParameter.get("recordId"), "")) {
             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("推流状态为空");
         }
@@ -172,12 +169,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);
@@ -219,21 +211,18 @@ public class TIeInvigilateCallMobileController {
     @Transactional
     public Result callCancel(@ApiJsonObject(name = "callCancelExamMobile", value = {
             @ApiJsonProperty(key = "recordId", type = "long", example = "1", description = "考试记录id", required = true),
+            @ApiJsonProperty(key = "source", description = "监考视频源", required = true)
     }) @ApiParam(value = "监控信息", required = true) @RequestBody Map<String, Object> mapParameter) {
         if (Objects.isNull(mapParameter.get("recordId")) || Objects.equals(mapParameter.get("recordId"), "")) {
             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("推流状态为空");
         }

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);
@@ -161,9 +161,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("推流状态为空");
@@ -200,9 +197,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("推流状态为空");