wangliang пре 4 година
родитељ
комит
49a28fca43

+ 8 - 13
themis-admin/src/main/java/com/qmth/themis/admin/api/TIeInvigilateController.java

@@ -200,18 +200,13 @@ public class TIeInvigilateController {
         }
         List<InvigilateListVideoBean> invigilateListVideoBeanList = tOeExamRecordService.invigilatePageListVideoRandom(examId, userId, randomNum, tbUser.getOrgId());
         if (Objects.nonNull(invigilateListVideoBeanList) && invigilateListVideoBeanList.size() > 0) {
-            ExamCacheBean examCacheBean = null;
-            if (Objects.nonNull(examId)) {
-                examCacheBean = teExamService.getExamCacheBean(examId);
-            }
-            List<String> monitorVideoSourceList = null;
-            if (Objects.nonNull(examCacheBean) && Objects.nonNull(examCacheBean.getMonitorVideoSource()) && !Objects.equals(examCacheBean.getMonitorVideoSource().toString().trim().replaceAll(" ", ""), "")) {
-                monitorVideoSourceList = Arrays.asList(examCacheBean.getMonitorVideoSource().trim().toUpperCase().replaceAll(" ", "").split(","));
-            }
-            ExamCacheBean finalExamCacheBean = examCacheBean;
-            List<String> finalMonitorVideoSourceList = monitorVideoSourceList;
             invigilateListVideoBeanList.forEach(s -> {
-                if (Objects.nonNull(finalMonitorVideoSourceList) && finalMonitorVideoSourceList.contains(MonitorVideoSourceEnum.CLIENT_CAMERA)) {
+                ExamCacheBean examCacheBean = teExamService.getExamCacheBean(s.getExamId());
+                List<String> monitorVideoSourceList = null;
+                if (Objects.nonNull(examCacheBean) && Objects.nonNull(examCacheBean.getMonitorVideoSource()) && !Objects.equals(examCacheBean.getMonitorVideoSource().toString().trim().replaceAll(" ", ""), "")) {
+                    monitorVideoSourceList = Arrays.asList(examCacheBean.getMonitorVideoSource().trim().toUpperCase().replaceAll(" ", "").split(","));
+                }
+                if (Objects.nonNull(monitorVideoSourceList) && monitorVideoSourceList.contains(MonitorVideoSourceEnum.CLIENT_CAMERA)) {
                     String monitorLiveUrl = SystemConstant.setStreamId(dictionaryConfig.monitorDomain().getPrefix(), s.getExamRecordId(), MonitorVideoSourceEnum.CLIENT_CAMERA);
                     if (Objects.nonNull(monitorLiveUrl)) {
                         s.setMonitorLiveUrl(monitorLiveUrl);
@@ -226,8 +221,8 @@ public class TIeInvigilateController {
                     s.setPaperDownload(paperDownLoad);
                 }
                 //剩余时间计算
-                if (Objects.nonNull(finalExamCacheBean)) {
-                    s.setRemainTime(this.getRemainTime(finalExamCacheBean.getMode(), s.getExamRecordId()));
+                if (Objects.nonNull(examCacheBean)) {
+                    s.setRemainTime(this.getRemainTime(examCacheBean.getMode(), s.getExamRecordId()));
                 }
             });
         }