wangliang 3 жил өмнө
parent
commit
f5ab0fbb66

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

@@ -173,10 +173,10 @@ public class TIeInvigilateCallMobileController {
         TEStudentCacheDto teStudentCacheDto = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();
         if (Objects.nonNull(teStudentCacheDto) && Objects.nonNull(teStudentCacheDto.getExamingRecordId())
                 && teStudentCacheDto.getExamingRecordId().longValue() == recordId.longValue()) {
-            String monitorRecord = ExamRecordCacheUtil.getMonitorRecord(recordId);
+            String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
             if (Objects.isNull(monitorRecord)) {
                 TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
-                monitorRecord = tOeExamRecord.getMonitorRecord();
+                monitorRecord = tOeExamRecord.getMonitorVideoSource();
             }
             Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
             if (Objects.isNull(monitorRecordMap)) {
@@ -234,10 +234,10 @@ public class TIeInvigilateCallMobileController {
         TEStudentCacheDto teStudentCacheDto = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();
         if (Objects.nonNull(teStudentCacheDto) && Objects.nonNull(teStudentCacheDto.getExamingRecordId())
                 && teStudentCacheDto.getExamingRecordId().longValue() == recordId.longValue()) {
-            String monitorRecord = ExamRecordCacheUtil.getMonitorRecord(recordId);
+            String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
             if (Objects.isNull(monitorRecord)) {
                 TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
-                monitorRecord = tOeExamRecord.getMonitorRecord();
+                monitorRecord = tOeExamRecord.getMonitorVideoSource();
             }
             Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
             if (Objects.isNull(monitorRecordMap)) {

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

@@ -140,10 +140,10 @@ public class TIeInvigilateCallMobileController {
         TEStudentCacheDto teStudentCacheDto = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();
         if (Objects.nonNull(teStudentCacheDto) && Objects.nonNull(teStudentCacheDto.getExamingRecordId())
                 && teStudentCacheDto.getExamingRecordId().longValue() == recordId.longValue()) {
-            String monitorRecord = ExamRecordCacheUtil.getMonitorRecord(recordId);
+            String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
             if (Objects.isNull(monitorRecord)) {
                 TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
-                monitorRecord = tOeExamRecord.getMonitorRecord();
+                monitorRecord = tOeExamRecord.getMonitorVideoSource();
             }
             Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
             if (Objects.isNull(monitorRecordMap)) {
@@ -201,10 +201,10 @@ public class TIeInvigilateCallMobileController {
         TEStudentCacheDto teStudentCacheDto = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();
         if (Objects.nonNull(teStudentCacheDto) && Objects.nonNull(teStudentCacheDto.getExamingRecordId())
                 && teStudentCacheDto.getExamingRecordId().longValue() == recordId.longValue()) {
-            String monitorRecord = ExamRecordCacheUtil.getMonitorRecord(recordId);
+            String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
             if (Objects.isNull(monitorRecord)) {
                 TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
-                monitorRecord = tOeExamRecord.getMonitorRecord();
+                monitorRecord = tOeExamRecord.getMonitorVideoSource();
             }
             Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
             if (Objects.isNull(monitorRecordMap)) {
@@ -281,10 +281,10 @@ public class TIeInvigilateCallMobileController {
         TEStudentCacheDto teStudentCacheDto = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();
         if (Objects.nonNull(teStudentCacheDto) && Objects.nonNull(teStudentCacheDto.getExamingRecordId())
                 && teStudentCacheDto.getExamingRecordId().longValue() == recordId.longValue()) {
-            String monitorRecord = ExamRecordCacheUtil.getMonitorRecord(recordId);
+            String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
             if (Objects.isNull(monitorRecord)) {
                 TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
-                monitorRecord = tOeExamRecord.getMonitorRecord();
+                monitorRecord = tOeExamRecord.getMonitorVideoSource();
             }
             Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
             if (Objects.isNull(monitorRecordMap)) {

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

@@ -139,10 +139,10 @@ public class TIeInvigilateCallOeController {
         TEStudentCacheDto teStudentCacheDto = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();
         if (Objects.nonNull(teStudentCacheDto) && Objects.nonNull(teStudentCacheDto.getExamingRecordId())
                 && teStudentCacheDto.getExamingRecordId().longValue() == recordId.longValue()) {
-            String monitorRecord = ExamRecordCacheUtil.getMonitorRecord(recordId);
+            String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
             if (Objects.isNull(monitorRecord)) {
                 TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
-                monitorRecord = tOeExamRecord.getMonitorRecord();
+                monitorRecord = tOeExamRecord.getMonitorVideoSource();
             }
             Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
             if (Objects.isNull(monitorRecordMap)) {
@@ -205,10 +205,10 @@ public class TIeInvigilateCallOeController {
         TEStudentCacheDto teStudentCacheDto = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();
         if (Objects.nonNull(teStudentCacheDto) && Objects.nonNull(teStudentCacheDto.getExamingRecordId())
                 && teStudentCacheDto.getExamingRecordId().longValue() == recordId.longValue()) {
-            String monitorRecord = ExamRecordCacheUtil.getMonitorRecord(recordId);
+            String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
             if (Objects.isNull(monitorRecord)) {
                 TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
-                monitorRecord = tOeExamRecord.getMonitorRecord();
+                monitorRecord = tOeExamRecord.getMonitorVideoSource();
             }
             Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
             if (Objects.isNull(monitorRecordMap)) {
@@ -260,10 +260,10 @@ public class TIeInvigilateCallOeController {
         TEStudentCacheDto teStudentCacheDto = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();
         if (Objects.nonNull(teStudentCacheDto) && Objects.nonNull(teStudentCacheDto.getExamingRecordId())
                 && teStudentCacheDto.getExamingRecordId().longValue() == recordId.longValue()) {
-            String monitorRecord = ExamRecordCacheUtil.getMonitorRecord(recordId);
+            String monitorRecord = ExamRecordCacheUtil.getMonitorVideoSource(recordId);
             if (Objects.isNull(monitorRecord)) {
                 TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(recordId);
-                monitorRecord = tOeExamRecord.getMonitorRecord();
+                monitorRecord = tOeExamRecord.getMonitorVideoSource();
             }
             Map<String, String> monitorRecordMap = SystemConstant.getMonitorRecordMap(monitorRecord);
             if (Objects.isNull(monitorRecordMap)) {