加入监考源判断

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

@@ -170,25 +170,19 @@ public class TIeInvigilateCallMobileController {
             throw new BusinessException("推流状态为空");
         }
         //2022/04/21加入校验
-        TEStudentCacheDto teStudentCacheDto = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();
-        if (Objects.nonNull(teStudentCacheDto) && Objects.nonNull(teStudentCacheDto.getExamingRecordId())
-                && teStudentCacheDto.getExamingRecordId().longValue() == recordId.longValue()) {
-            String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
-            if (Objects.isNull(monitorRecord)) {
-                TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
-                monitorRecord = tOeExamRecord.getMonitorVideoSource();
-            }
-            Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
-            if (Objects.isNull(monitorRecordMap)) {
+        String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
+        if (Objects.isNull(monitorRecord)) {
+            TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
+            monitorRecord = tOeExamRecord.getMonitorVideoSource();
+        }
+        Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
+        if (Objects.isNull(monitorRecordMap)) {
+            return ResultUtil.ok();
+        } else {
+            String monitorRecordStr = monitorRecordMap.get(source.name());
+            if (Objects.isNull(monitorRecordStr)) {
                 return ResultUtil.ok();
-            } else {
-                String monitorRecordStr = monitorRecordMap.get(source.name());
-                if (Objects.isNull(monitorRecordStr)) {
-                    return ResultUtil.ok();
-                }
             }
-        } else {
-            return ResultUtil.ok();
         }
         Long timestamp = System.currentTimeMillis();
         ExamRecordCacheUtil.setMonitorCallStatus(recordId, source, MonitorCallStatusSourceEnum.CALLING, timestamp);
@@ -231,25 +225,19 @@ public class TIeInvigilateCallMobileController {
             throw new BusinessException("推流状态为空");
         }
         //2022/04/21加入校验
-        TEStudentCacheDto teStudentCacheDto = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();
-        if (Objects.nonNull(teStudentCacheDto) && Objects.nonNull(teStudentCacheDto.getExamingRecordId())
-                && teStudentCacheDto.getExamingRecordId().longValue() == recordId.longValue()) {
-            String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
-            if (Objects.isNull(monitorRecord)) {
-                TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
-                monitorRecord = tOeExamRecord.getMonitorVideoSource();
-            }
-            Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
-            if (Objects.isNull(monitorRecordMap)) {
+        String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
+        if (Objects.isNull(monitorRecord)) {
+            TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
+            monitorRecord = tOeExamRecord.getMonitorVideoSource();
+        }
+        Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
+        if (Objects.isNull(monitorRecordMap)) {
+            return ResultUtil.ok();
+        } else {
+            String monitorRecordStr = monitorRecordMap.get(source.name());
+            if (Objects.isNull(monitorRecordStr)) {
                 return ResultUtil.ok();
-            } else {
-                String monitorRecordStr = monitorRecordMap.get(source.name());
-                if (Objects.isNull(monitorRecordStr)) {
-                    return ResultUtil.ok();
-                }
             }
-        } else {
-            return ResultUtil.ok();
         }
 
         Long timestamp = System.currentTimeMillis();

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

@@ -137,25 +137,19 @@ public class TIeInvigilateCallMobileController {
             throw new BusinessException("推流状态不正常");
         }
         //2022/04/21加入校验
-        TEStudentCacheDto teStudentCacheDto = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();
-        if (Objects.nonNull(teStudentCacheDto) && Objects.nonNull(teStudentCacheDto.getExamingRecordId())
-                && teStudentCacheDto.getExamingRecordId().longValue() == recordId.longValue()) {
-            String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
-            if (Objects.isNull(monitorRecord)) {
-                TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
-                monitorRecord = tOeExamRecord.getMonitorVideoSource();
-            }
-            Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
-            if (Objects.isNull(monitorRecordMap)) {
+        String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
+        if (Objects.isNull(monitorRecord)) {
+            TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
+            monitorRecord = tOeExamRecord.getMonitorVideoSource();
+        }
+        Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
+        if (Objects.isNull(monitorRecordMap)) {
+            return ResultUtil.ok();
+        } else {
+            String monitorRecordStr = monitorRecordMap.get(source.name());
+            if (Objects.isNull(monitorRecordStr)) {
                 return ResultUtil.ok();
-            } else {
-                String monitorRecordStr = monitorRecordMap.get(source.name());
-                if (Objects.isNull(monitorRecordStr)) {
-                    return ResultUtil.ok();
-                }
             }
-        } else {
-            return ResultUtil.ok();
         }
 
         String liveUrl = SystemConstant.setStreamId(dictionaryConfig.monitorDomain().getPrefix(), recordId, source);
@@ -198,25 +192,19 @@ public class TIeInvigilateCallMobileController {
             throw new BusinessException("异常类型不能为空");
         }
         //2022/04/21加入校验
-        TEStudentCacheDto teStudentCacheDto = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();
-        if (Objects.nonNull(teStudentCacheDto) && Objects.nonNull(teStudentCacheDto.getExamingRecordId())
-                && teStudentCacheDto.getExamingRecordId().longValue() == recordId.longValue()) {
-            String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
-            if (Objects.isNull(monitorRecord)) {
-                TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
-                monitorRecord = tOeExamRecord.getMonitorVideoSource();
-            }
-            Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
-            if (Objects.isNull(monitorRecordMap)) {
+        String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
+        if (Objects.isNull(monitorRecord)) {
+            TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
+            monitorRecord = tOeExamRecord.getMonitorVideoSource();
+        }
+        Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
+        if (Objects.isNull(monitorRecordMap)) {
+            return ResultUtil.ok();
+        } else {
+            String monitorRecordStr = monitorRecordMap.get(source.name());
+            if (Objects.isNull(monitorRecordStr)) {
                 return ResultUtil.ok();
-            } else {
-                String monitorRecordStr = monitorRecordMap.get(source.name());
-                if (Objects.isNull(monitorRecordStr)) {
-                    return ResultUtil.ok();
-                }
             }
-        } else {
-            return ResultUtil.ok();
         }
         //获取考试记录缓存
         String liveUrl = SystemConstant.setStreamId(dictionaryConfig.monitorDomain().getPrefix(), recordId, source);
@@ -278,25 +266,19 @@ public class TIeInvigilateCallMobileController {
             throw new BusinessException("推流状态为空");
         }
         //2022/04/21加入校验
-        TEStudentCacheDto teStudentCacheDto = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();
-        if (Objects.nonNull(teStudentCacheDto) && Objects.nonNull(teStudentCacheDto.getExamingRecordId())
-                && teStudentCacheDto.getExamingRecordId().longValue() == recordId.longValue()) {
-            String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
-            if (Objects.isNull(monitorRecord)) {
-                TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
-                monitorRecord = tOeExamRecord.getMonitorVideoSource();
-            }
-            Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
-            if (Objects.isNull(monitorRecordMap)) {
+        String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
+        if (Objects.isNull(monitorRecord)) {
+            TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
+            monitorRecord = tOeExamRecord.getMonitorVideoSource();
+        }
+        Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
+        if (Objects.isNull(monitorRecordMap)) {
+            return ResultUtil.ok();
+        } else {
+            String monitorRecordStr = monitorRecordMap.get(source.name());
+            if (Objects.isNull(monitorRecordStr)) {
                 return ResultUtil.ok();
-            } else {
-                String monitorRecordStr = monitorRecordMap.get(source.name());
-                if (Objects.isNull(monitorRecordStr)) {
-                    return ResultUtil.ok();
-                }
             }
-        } else {
-            return ResultUtil.ok();
         }
         String liveUrl = SystemConstant.setStreamId(dictionaryConfig.monitorDomain().getPrefix(), recordId, source);
         Long timestamp = System.currentTimeMillis();